diff options
| -rw-r--r-- | libdevkit-power/Makefile.am | 9 | ||||
| -rw-r--r-- | libdevkit-power/dkp-client-device.c (renamed from tools/dkp-client-device.c) | 0 | ||||
| -rw-r--r-- | libdevkit-power/dkp-client-device.h (renamed from tools/dkp-client-device.h) | 0 | ||||
| -rw-r--r-- | libdevkit-power/dkp-client.c (renamed from tools/dkp-client.c) | 0 | ||||
| -rw-r--r-- | libdevkit-power/dkp-client.h (renamed from tools/dkp-client.h) | 0 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
6 files changed, 7 insertions, 6 deletions
diff --git a/libdevkit-power/Makefile.am b/libdevkit-power/Makefile.am index 30bb5dd..ea8c61b 100644 --- a/libdevkit-power/Makefile.am +++ b/libdevkit-power/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ -I$(top_srcdir)/libdevkit-power \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @@ -11,6 +11,10 @@ noinst_LTLIBRARIES = \ libdevkit_power_la_SOURCES = \ dkp-debug.c \ dkp-debug.h \ + dkp-client.c \ + dkp-client.h \ + dkp-client-device.c \ + dkp-client-device.h \ dkp-history-obj.h \ dkp-history-obj.c \ dkp-enum.c \ @@ -18,7 +22,8 @@ libdevkit_power_la_SOURCES = \ dkp-object.c \ dkp-object.h -libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) +libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) + clean-local: rm -f *~ diff --git a/tools/dkp-client-device.c b/libdevkit-power/dkp-client-device.c index 4402bc6..4402bc6 100644 --- a/tools/dkp-client-device.c +++ b/libdevkit-power/dkp-client-device.c diff --git a/tools/dkp-client-device.h b/libdevkit-power/dkp-client-device.h index 646d4f6..646d4f6 100644 --- a/tools/dkp-client-device.h +++ b/libdevkit-power/dkp-client-device.h diff --git a/tools/dkp-client.c b/libdevkit-power/dkp-client.c index d82bdc0..d82bdc0 100644 --- a/tools/dkp-client.c +++ b/libdevkit-power/dkp-client.c diff --git a/tools/dkp-client.h b/libdevkit-power/dkp-client.h index 5c9fb61..5c9fb61 100644 --- a/tools/dkp-client.h +++ b/libdevkit-power/dkp-client.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 4c88843..cab1a2d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -34,10 +34,6 @@ bin_PROGRAMS = devkit-power devkit-power-on-battery devkit_power_SOURCES = \ dkp-tool.c \ - dkp-client.c \ - dkp-client.h \ - dkp-client-device.c \ - dkp-client-device.h \ $(BUILT_SOURCES) devkit_power_CPPFLAGS = \ |