gnome-power-manager r3117 - in trunk: . src

[rhughes svn gnome org]

Author: rhughes
Date: Tue Dec  2 17:19:24 2008
New Revision: 3117
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3117&view=rev

Log:
2008-12-02  Richard Hughes  <richard hughsie com>

* src/Makefile.am:
* src/gpm-graph-widget-old.c:
* src/gpm-graph-widget-old.h:
* src/gpm-statistics-core.c:
* src/gpm-statistics-core.h:
* src/gpm-statistics-old.c:
gnome-power-statistics is a tool for DeviceKit-power only.


Removed:
   trunk/src/gpm-graph-widget-old.c
   trunk/src/gpm-graph-widget-old.h
   trunk/src/gpm-statistics-core.c
   trunk/src/gpm-statistics-core.h
   trunk/src/gpm-statistics-old.c
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Dec  2 17:19:24 2008
@@ -50,12 +50,18 @@
 bin_PROGRAMS =						\
 	gnome-power-manager				\
 	gnome-power-preferences				\
+	$(NULL)
+
+if HAVE_DK_POWER
+bin_PROGRAMS +=						\
 	gnome-power-statistics				\
 	$(NULL)
+endif
 
 check_PROGRAMS =					\
 	gnome-power-self-test
 
+if HAVE_DK_POWER
 gnome_power_statistics_SOURCES =			\
 	egg-color.c					\
 	egg-color.h					\
@@ -65,16 +71,12 @@
 	egg-unique.c					\
 	egg-precision.h					\
 	egg-precision.c					\
-	gpm-common.h					\
-	gpm-common.c					\
-	$(NULL)
-
-if HAVE_DK_POWER
-gnome_power_statistics_SOURCES +=			\
 	egg-obj-list.c					\
 	egg-obj-list.h					\
 	egg-array-float.c				\
 	egg-array-float.h				\
+	gpm-common.h					\
+	gpm-common.c					\
 	gpm-statistics.c				\
 	gpm-devicekit.c					\
 	gpm-devicekit.h					\
@@ -83,30 +85,10 @@
 	gpm-graph-widget.h				\
 	gpm-graph-widget.c				\
 	$(NULL)
-else
-gnome_power_statistics_SOURCES +=			\
-	egg-discrete.h					\
-	egg-discrete.c					\
-	egg-dbus-proxy.h				\
-	egg-dbus-proxy.c				\
-	egg-dbus-monitor.h				\
-	egg-dbus-monitor.c				\
-	gpm-statistics-old.c				\
-	gpm-statistics-core.h				\
-	gpm-statistics-core.c				\
-	gpm-marshal.h					\
-	gpm-marshal.c					\
-	gpm-array.h					\
-	gpm-array.c					\
-	gpm-array-float.h				\
-	gpm-array-float.c				\
-	gpm-graph-widget-old.h				\
-	gpm-graph-widget-old.c				\
-	$(NULL)
-endif
 
 gnome_power_statistics_LDADD =				\
 	$(GLIB_LIBS)					\
+	$(DEVKIT_POWER_LIBS)				\
 	$(GNOME_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(NULL)
@@ -114,11 +96,9 @@
 if HAVE_UNIQUE
 gnome_power_statistics_LDADD +=				\
 	$(UNIQUE_LIBS)
+	$(NULL)
 endif
 
-if HAVE_DK_POWER
-gnome_power_statistics_LDADD +=				\
-	$(DEVKIT_POWER_LIBS)
 endif
 
 gnome_power_preferences_SOURCES =			\
@@ -368,11 +348,14 @@
 	org.freedesktop.PowerManagement.h		\
 	org.freedesktop.PowerManagement.Inhibit.h	\
 	org.freedesktop.PowerManagement.Backlight.h	\
-	org.freedesktop.PowerManagement.Statistics.h	\
 	gpm-marshal.c					\
 	gpm-marshal.h					\
 	$(NULL)
 
+if !HAVE_DK_POWER
+BUILT_SOURCES += org.freedesktop.PowerManagement.Statistics.h
+endif
+
 gpm-marshal.c: gpm-marshal.list
 	echo "#include \"gpm-marshal.h\"" > $@ && \
 	@GLIB_GENMARSHAL@ $< --prefix=gpm_marshal --body >> $@
@@ -394,12 +377,14 @@
 		--output=org.freedesktop.PowerManagement.Inhibit.h	\
 		$(srcdir)/org.freedesktop.PowerManagement.Inhibit.xml
 
+if !HAVE_DK_POWER
 org.freedesktop.PowerManagement.Statistics.h: org.freedesktop.PowerManagement.Statistics.xml
 	libtool --mode=execute dbus-binding-tool	\
 		--prefix=gpm_statistics			\
 		--mode=glib-server			\
 		--output=org.freedesktop.PowerManagement.Statistics.h	\
 		$(srcdir)/org.freedesktop.PowerManagement.Statistics.xml
+endif
 
 org.freedesktop.PowerManagement.Backlight.h: org.freedesktop.PowerManagement.Backlight.xml
 	libtool --mode=execute dbus-binding-tool	\