summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2009-02-27 12:22:06 +0000
committerRichard Hughes <richard@hughsie.com>2009-02-27 12:22:06 +0000
commitd2c0ee64128b537408e6e4cea99682ed27dc2736 (patch)
tree7f50e3d33e463d40562cb5ce11086c373f76215d
parent5259367a6b14be9037ec72e8cb270f385fed84be (diff)
move the library directory from libdevkit-power to devkit-power-gobject
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--devkit-power-gobject/.gitignore (renamed from libdevkit-power/.gitignore)0
-rw-r--r--devkit-power-gobject/Makefile.am (renamed from libdevkit-power/Makefile.am)8
-rw-r--r--devkit-power-gobject/dkp-client.c (renamed from libdevkit-power/dkp-client.c)0
-rw-r--r--devkit-power-gobject/dkp-client.h (renamed from libdevkit-power/dkp-client.h)4
-rw-r--r--devkit-power-gobject/dkp-device.c (renamed from libdevkit-power/dkp-device.c)0
-rw-r--r--devkit-power-gobject/dkp-device.h (renamed from libdevkit-power/dkp-device.h)2
-rw-r--r--devkit-power-gobject/dkp-enum.c (renamed from libdevkit-power/dkp-enum.c)0
-rw-r--r--devkit-power-gobject/dkp-enum.h (renamed from libdevkit-power/dkp-enum.h)0
-rw-r--r--devkit-power-gobject/dkp-history-obj.c (renamed from libdevkit-power/dkp-history-obj.c)0
-rw-r--r--devkit-power-gobject/dkp-history-obj.h (renamed from libdevkit-power/dkp-history-obj.h)2
-rw-r--r--devkit-power-gobject/dkp-qos-obj.c (renamed from libdevkit-power/dkp-qos-obj.c)0
-rw-r--r--devkit-power-gobject/dkp-qos-obj.h (renamed from libdevkit-power/dkp-qos-obj.h)2
-rw-r--r--devkit-power-gobject/dkp-stats-obj.c (renamed from libdevkit-power/dkp-stats-obj.c)0
-rw-r--r--devkit-power-gobject/dkp-stats-obj.h (renamed from libdevkit-power/dkp-stats-obj.h)2
-rw-r--r--devkit-power-gobject/dkp-wakeups-obj.c (renamed from libdevkit-power/dkp-wakeups-obj.c)0
-rw-r--r--devkit-power-gobject/dkp-wakeups-obj.h (renamed from libdevkit-power/dkp-wakeups-obj.h)2
-rw-r--r--devkit-power-gobject/dkp-wakeups.c (renamed from libdevkit-power/dkp-wakeups.c)0
-rw-r--r--devkit-power-gobject/dkp-wakeups.h (renamed from libdevkit-power/dkp-wakeups.h)6
l---------devkit-power-gobject/egg-debug.c (renamed from libdevkit-power/egg-debug.c)0
l---------devkit-power-gobject/egg-debug.h (renamed from libdevkit-power/egg-debug.h)0
l---------devkit-power-gobject/egg-string.c (renamed from libdevkit-power/egg-string.c)0
l---------devkit-power-gobject/egg-string.h (renamed from libdevkit-power/egg-string.h)0
-rw-r--r--src/Makefile.am4
-rw-r--r--tools/Makefile.am4
26 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index fec2df4..62dd58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = libdevkit-power src doc tools policy po
+SUBDIRS = devkit-power-gobject src doc tools policy po
# Creating ChangeLog from git log (taken from cairo/Makefile.am):
ChangeLog: $(srcdir)/ChangeLog
diff --git a/configure.ac b/configure.ac
index 6629ebd..dbc59e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ doc/version.xml
doc/man/Makefile
doc/dbus/Makefile
policy/Makefile
-libdevkit-power/Makefile
+devkit-power-gobject/Makefile
po/Makefile.in
])
diff --git a/libdevkit-power/.gitignore b/devkit-power-gobject/.gitignore
index e9199c5..e9199c5 100644
--- a/libdevkit-power/.gitignore
+++ b/devkit-power-gobject/.gitignore
diff --git a/libdevkit-power/Makefile.am b/devkit-power-gobject/Makefile.am
index d30c9e8..303b2dc 100644
--- a/libdevkit-power/Makefile.am
+++ b/devkit-power-gobject/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/libdevkit-power \
+ -I$(top_srcdir)/devkit-power-gobject \
-DDKP_COMPILATION \
-DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
@@ -12,9 +12,9 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
noinst_LTLIBRARIES = \
- libdevkit-power.la
+ libdevkit-power-gobject.la
-libdevkit_power_la_SOURCES = \
+libdevkit_power_gobject_la_SOURCES = \
egg-debug.c \
egg-debug.h \
egg-string.c \
@@ -37,7 +37,7 @@ libdevkit_power_la_SOURCES = \
dkp-enum.c \
dkp-enum.h
-libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
+libdevkit_power_gobject_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
clean-local:
diff --git a/libdevkit-power/dkp-client.c b/devkit-power-gobject/dkp-client.c
index 91d4a09..91d4a09 100644
--- a/libdevkit-power/dkp-client.c
+++ b/devkit-power-gobject/dkp-client.c
diff --git a/libdevkit-power/dkp-client.h b/devkit-power-gobject/dkp-client.h
index c28a7ee..74a3bcb 100644
--- a/libdevkit-power/dkp-client.h
+++ b/devkit-power-gobject/dkp-client.h
@@ -27,8 +27,8 @@
#define __DKP_CLIENT_H
#include <glib-object.h>
-#include <libdevkit-power/dkp-enum.h>
-#include <libdevkit-power/dkp-device.h>
+#include <devkit-power-gobject/dkp-enum.h>
+#include <devkit-power-gobject/dkp-device.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-device.c b/devkit-power-gobject/dkp-device.c
index 5f47015..5f47015 100644
--- a/libdevkit-power/dkp-device.c
+++ b/devkit-power-gobject/dkp-device.c
diff --git a/libdevkit-power/dkp-device.h b/devkit-power-gobject/dkp-device.h
index a3a8294..8ad219c 100644
--- a/libdevkit-power/dkp-device.h
+++ b/devkit-power-gobject/dkp-device.h
@@ -27,7 +27,7 @@
#define __DKP_DEVICE_H
#include <glib-object.h>
-#include <libdevkit-power/dkp-enum.h>
+#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-enum.c b/devkit-power-gobject/dkp-enum.c
index 6f22dd0..6f22dd0 100644
--- a/libdevkit-power/dkp-enum.c
+++ b/devkit-power-gobject/dkp-enum.c
diff --git a/libdevkit-power/dkp-enum.h b/devkit-power-gobject/dkp-enum.h
index 28ec8d7..28ec8d7 100644
--- a/libdevkit-power/dkp-enum.h
+++ b/devkit-power-gobject/dkp-enum.h
diff --git a/libdevkit-power/dkp-history-obj.c b/devkit-power-gobject/dkp-history-obj.c
index 5727cb9..5727cb9 100644
--- a/libdevkit-power/dkp-history-obj.c
+++ b/devkit-power-gobject/dkp-history-obj.c
diff --git a/libdevkit-power/dkp-history-obj.h b/devkit-power-gobject/dkp-history-obj.h
index a676889..d1dce89 100644
--- a/libdevkit-power/dkp-history-obj.h
+++ b/devkit-power-gobject/dkp-history-obj.h
@@ -26,7 +26,7 @@
#define __DKP_HISTORY_OBJ_H__
#include <glib.h>
-#include <libdevkit-power/dkp-enum.h>
+#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-qos-obj.c b/devkit-power-gobject/dkp-qos-obj.c
index 914c144..914c144 100644
--- a/libdevkit-power/dkp-qos-obj.c
+++ b/devkit-power-gobject/dkp-qos-obj.c
diff --git a/libdevkit-power/dkp-qos-obj.h b/devkit-power-gobject/dkp-qos-obj.h
index 4e2b36c..69d6ff4 100644
--- a/libdevkit-power/dkp-qos-obj.h
+++ b/devkit-power-gobject/dkp-qos-obj.h
@@ -26,7 +26,7 @@
#define __DKP_QOS_OBJ_H__
#include <glib.h>
-#include <libdevkit-power/dkp-enum.h>
+#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-stats-obj.c b/devkit-power-gobject/dkp-stats-obj.c
index dbb3841..dbb3841 100644
--- a/libdevkit-power/dkp-stats-obj.c
+++ b/devkit-power-gobject/dkp-stats-obj.c
diff --git a/libdevkit-power/dkp-stats-obj.h b/devkit-power-gobject/dkp-stats-obj.h
index 8daa68a..52ff913 100644
--- a/libdevkit-power/dkp-stats-obj.h
+++ b/devkit-power-gobject/dkp-stats-obj.h
@@ -26,7 +26,7 @@
#define __DKP_STATS_OBJ_H__
#include <glib.h>
-#include <libdevkit-power/dkp-enum.h>
+#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-wakeups-obj.c b/devkit-power-gobject/dkp-wakeups-obj.c
index fcbaa94..fcbaa94 100644
--- a/libdevkit-power/dkp-wakeups-obj.c
+++ b/devkit-power-gobject/dkp-wakeups-obj.c
diff --git a/libdevkit-power/dkp-wakeups-obj.h b/devkit-power-gobject/dkp-wakeups-obj.h
index 52d48dc..7d2d3ef 100644
--- a/libdevkit-power/dkp-wakeups-obj.h
+++ b/devkit-power-gobject/dkp-wakeups-obj.h
@@ -26,7 +26,7 @@
#define __DKP_WAKEUPS_OBJ_H__
#include <glib.h>
-#include <libdevkit-power/dkp-enum.h>
+#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/dkp-wakeups.c b/devkit-power-gobject/dkp-wakeups.c
index de48ac8..de48ac8 100644
--- a/libdevkit-power/dkp-wakeups.c
+++ b/devkit-power-gobject/dkp-wakeups.c
diff --git a/libdevkit-power/dkp-wakeups.h b/devkit-power-gobject/dkp-wakeups.h
index 890920f..f03fc40 100644
--- a/libdevkit-power/dkp-wakeups.h
+++ b/devkit-power-gobject/dkp-wakeups.h
@@ -27,9 +27,9 @@
#define __DKP_WAKEUPS_H
#include <glib-object.h>
-#include <libdevkit-power/dkp-enum.h>
-#include <libdevkit-power/dkp-device.h>
-#include <libdevkit-power/dkp-wakeups-obj.h>
+#include <devkit-power-gobject/dkp-enum.h>
+#include <devkit-power-gobject/dkp-device.h>
+#include <devkit-power-gobject/dkp-wakeups-obj.h>
G_BEGIN_DECLS
diff --git a/libdevkit-power/egg-debug.c b/devkit-power-gobject/egg-debug.c
index 0a3eb62..0a3eb62 120000
--- a/libdevkit-power/egg-debug.c
+++ b/devkit-power-gobject/egg-debug.c
diff --git a/libdevkit-power/egg-debug.h b/devkit-power-gobject/egg-debug.h
index db811d2..db811d2 120000
--- a/libdevkit-power/egg-debug.h
+++ b/devkit-power-gobject/egg-debug.h
diff --git a/libdevkit-power/egg-string.c b/devkit-power-gobject/egg-string.c
index 6ad7909..6ad7909 120000
--- a/libdevkit-power/egg-string.c
+++ b/devkit-power-gobject/egg-string.c
diff --git a/libdevkit-power/egg-string.h b/devkit-power-gobject/egg-string.h
index d7e801b..d7e801b 120000
--- a/libdevkit-power/egg-string.h
+++ b/devkit-power-gobject/egg-string.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 608a0a6..230a584 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
-DEGG_CONSOLE="\"DKP_CONSOLE\"" \
- -I$(top_srcdir)/libdevkit-power \
+ -I$(top_srcdir)/devkit-power-gobject \
-I$(top_srcdir) \
$(GIO_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
@@ -23,7 +23,7 @@ INCLUDES = \
$(DEVKIT_CFLAGS) \
$(GLIB_CFLAGS)
-DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
+DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.h \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d3ba13e..6c22e7f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,12 +15,12 @@ INCLUDES = \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
-DEGG_CONSOLE="\"DKP_CONSOLE\"" \
-I$(top_srcdir) \
- -I$(top_srcdir)/libdevkit-power \
+ -I$(top_srcdir)/devkit-power-gobject \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_DBUS_CFLAGS) \
$(GLIB_CFLAGS)
-DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
+DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.h \