From 7c37451d58fffba37fcd93b3e7f60c6724f3e474 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 27 Oct 2019 19:55:42 +0000 Subject: [PATCH] wmbattery: move Makefile to Makefile.in, inline the contents of makeinfo.in and remove it. Signed-off-by: Jeremy Sowden --- wmbattery/{Makefile => Makefile.in} | 22 +++++++++++++++++++++- wmbattery/autoconf/makeinfo.in | 21 --------------------- wmbattery/configure.ac | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) rename wmbattery/{Makefile => Makefile.in} (68%) delete mode 100644 wmbattery/autoconf/makeinfo.in diff --git a/wmbattery/Makefile b/wmbattery/Makefile.in similarity index 68% rename from wmbattery/Makefile rename to wmbattery/Makefile.in index 863d07a..1b0498b 100644 --- a/wmbattery/Makefile +++ b/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 diff --git a/wmbattery/autoconf/makeinfo.in b/wmbattery/autoconf/makeinfo.in deleted file mode 100644 index abb9ae9..0000000 --- a/wmbattery/autoconf/makeinfo.in +++ /dev/null @@ -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 diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac index b6065fb..bc67bf6 100644 --- a/wmbattery/configure.ac +++ b/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) -- 2.11.4.GIT