From 122e56d9e1b4b8d2f2b7bf3dd9daf5577d6b2699 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 23 May 2012 10:42:13 -0500 Subject: move libpower's automake rules into src/ --- Makefile.am | 28 +--------------------------- configure.ac | 1 + src/Makefile.am | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 src/Makefile.am diff --git a/Makefile.am b/Makefile.am index 25cbee5..54ec6a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,30 +1,4 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = \ - po \ - data - -################### -# Indicator Stuff -################### - -powerlibdir = $(INDICATORDIR) -powerlib_LTLIBRARIES = libpower.la -libpower_la_SOURCES = \ - src/indicator-power.c -libpower_la_CFLAGS = \ - $(UPOWER_CFLAGS) \ - $(INDICATOR_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -Wall -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Power\" -libpower_la_LIBADD = \ - $(UPOWER_LIBS) \ - $(INDICATOR_LIBS) -libpower_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - -module \ - -avoid-version +SUBDIRS = po data src ############################################################ diff --git a/configure.ac b/configure.ac index fc287a2..433c7be 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,7 @@ AC_CONFIG_FILES([ Makefile po/Makefile.in data/Makefile +src/Makefile ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..e0211a0 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,28 @@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +################### +# Indicator Stuff +################### + +powerlibdir = $(INDICATORDIR) +powerlib_LTLIBRARIES = libpower.la + +libpower_la_SOURCES = \ + indicator-power.c + +libpower_la_CFLAGS = \ + $(UPOWER_CFLAGS) \ + $(INDICATOR_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Power\" + +libpower_la_LIBADD = \ + $(UPOWER_LIBS) \ + $(INDICATOR_LIBS) + +libpower_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module \ + -avoid-version + -- cgit v1.2.3