From 122e56d9e1b4b8d2f2b7bf3dd9daf5577d6b2699 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 23 May 2012 10:42:13 -0500
Subject: move libpower's automake rules into src/

---
 src/Makefile.am | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/Makefile.am

(limited to 'src/Makefile.am')

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


From 622c18549745d3824713fd9d7a4a0d89b31257a5 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 24 May 2012 09:49:30 -0500
Subject: add private container struct IndicatorPowerDevice

---
 src/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index e0211a0..d14c270 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,12 +8,16 @@ powerlibdir = $(INDICATORDIR)
 powerlib_LTLIBRARIES = libpower.la
 
 libpower_la_SOURCES = \
+        device.c \
         indicator-power.c
 
+noinst_HEADERS = \
+        device.h
+
 libpower_la_CFLAGS = \
         $(UPOWER_CFLAGS) \
         $(INDICATOR_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
+        $(COVERAGE_CFLAGS) \
         -Wall -Werror \
         -DG_LOG_DOMAIN=\"Indicator-Power\"
 
@@ -22,7 +26,7 @@ libpower_la_LIBADD = \
         $(INDICATOR_LIBS)
 
 libpower_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
+        $(COVERAGE_LDFLAGS) \
         -module \
         -avoid-version
 
-- 
cgit v1.2.3


From 9ee74a367606a4dd6779b0448bef237dd9e2797e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sat, 26 May 2012 15:19:38 -0500
Subject: separate the dbus org.gnome.SettingsDaemon.Power logic into a
 separate class

---
 src/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index d14c270..c3200a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,11 +8,14 @@ powerlibdir = $(INDICATORDIR)
 powerlib_LTLIBRARIES = libpower.la
 
 libpower_la_SOURCES = \
+        dbus-listener.c \
         device.c \
         indicator-power.c
 
 noinst_HEADERS = \
-        device.h
+        dbus-listener.h \
+        device.h \
+        indicator-power.h
 
 libpower_la_CFLAGS = \
         $(UPOWER_CFLAGS) \
-- 
cgit v1.2.3


From 624a1f305ba4b9914ac489e86a649d117cc33995 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 1 Jun 2012 12:39:15 -0500
Subject: Add gcda/gcno to CLEANFILES s.t. 'make clean' will cover them

---
 src/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index c3200a7..73c30a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+CLEANFILES =
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 ###################
@@ -12,6 +13,8 @@ libpower_la_SOURCES = \
         device.c \
         indicator-power.c
 
+CLEANFILES += .libs/*.gcda .libs/*.gcno *.gcda *.gcno
+
 noinst_HEADERS = \
         dbus-listener.h \
         device.h \
-- 
cgit v1.2.3


From 15d6b254b2a9fcdca5fd76c8f58c8a0274e63322 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 6 Jun 2012 14:30:34 -0500
Subject: move the header files from noinst_HEADERS to libpower_la_SOURCES

---
 src/Makefile.am | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 73c30a0..b2cf3df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,16 +10,14 @@ powerlib_LTLIBRARIES = libpower.la
 
 libpower_la_SOURCES = \
         dbus-listener.c \
+        dbus-listener.h \
         device.c \
+        device.h \
+        indicator-power.h \
         indicator-power.c
 
 CLEANFILES += .libs/*.gcda .libs/*.gcno *.gcda *.gcno
 
-noinst_HEADERS = \
-        dbus-listener.h \
-        device.h \
-        indicator-power.h
-
 libpower_la_CFLAGS = \
         $(UPOWER_CFLAGS) \
         $(INDICATOR_CFLAGS) \
-- 
cgit v1.2.3