wmbattery: move Makefile to Makefile.in, inline the contents of makeinfo.in and remove it.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>

wmbattery/Makefile.in

@@ -1,4 +1,24 @@
-include makeinfo
+# Info for make, this will be preprocessed by autoconf.
+prefix		= @prefix@
+exec_prefix 	= @exec_prefix@
+bindir		= @bindir@
+icondir		= @datadir@/icons/wmbattery
+man1dir		= @mandir@/man1
+srcdir		= @srcdir@
+
+CC		= @CC@
+CFLAGS		= @CFLAGS@ -Wall -DACPI_APM
+CPPFLAGS	= @CPPFLAGS@ -DICONDIR=\"$(icondir)\"
+INSTALL		= @INSTALL@
+INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
+
+#remove hal support
+#USE_HAL		= 1
+
+USE_UPOWER = 1
 
 all: wmbattery
 

wmbattery/autoconf/makeinfo.in

@@ -1,21 +0,0 @@
-# Info for make, this will be preprocessed by autoconf.
-bindir		= @bindir@
-exec_prefix 	= @exec_prefix@
-icondir		= @datadir@/icons/wmbattery
-man1dir		= @mandir@/man1
-prefix		= @prefix@
-srcdir		= @srcdir@
-
-CC		= @CC@
-CFLAGS		= @CFLAGS@ -Wall -DACPI_APM
-CPPFLAGS	= @CPPFLAGS@ -DICONDIR=\"$(icondir)\"
-INSTALL		= @INSTALL@
-INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
-LDFLAGS		= @LDFLAGS@
-LIBS		= @LIBS@
-
-#remove hal support
-#USE_HAL		= 1
-
-USE_UPOWER = 1

wmbattery/configure.ac

@@ -47,4 +47,4 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(strdup)
 
-AC_OUTPUT(makeinfo:autoconf/makeinfo.in)
+AC_OUTPUT(Makefile)