diff options
| -rw-r--r-- | xfconf-query/Makefile.am | 2 | ||||
| -rw-r--r-- | xfconf-query/main.c | 4 | ||||
| -rw-r--r-- | xfconf/Makefile.am | 3 | ||||
| -rw-r--r-- | xfconf/xfconf-binding.c | 4 | ||||
| -rw-r--r-- | xfconf/xfconf-cache.c | 6 | ||||
| -rw-r--r-- | xfconf/xfconf-channel.c | 8 | ||||
| -rw-r--r-- | xfconf/xfconf.c | 2 | ||||
| -rw-r--r-- | xfconfd/Makefile.am | 3 | ||||
| -rw-r--r-- | xfconfd/xfconf-backend-perchannel-xml.c | 4 | ||||
| -rw-r--r-- | xfconfd/xfconf-daemon.c | 6 |
10 files changed, 18 insertions, 24 deletions
diff --git a/xfconf-query/Makefile.am b/xfconf-query/Makefile.am index eb7a2eb..eec8346 100644 --- a/xfconf-query/Makefile.am +++ b/xfconf-query/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ - -I$(top_srcdir)/common \ + -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"xfconf-query\" \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ diff --git a/xfconf-query/main.c b/xfconf-query/main.c index e339c98..fe09918 100644 --- a/xfconf-query/main.c +++ b/xfconf-query/main.c @@ -56,8 +56,8 @@ #endif #endif -#include "xfconf-gvaluefuncs.h" -#include "xfconf-common-private.h" +#include "common/xfconf-gvaluefuncs.h" +#include "common/xfconf-common-private.h" #include "xfconf/xfconf.h" static gboolean version = FALSE; diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am index 7c3e817..8977a17 100644 --- a/xfconf/Makefile.am +++ b/xfconf/Makefile.am @@ -1,9 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/common \ - -I$(top_builddir) \ - -I$(top_builddir)/common \ -DLIBXFCONF_COMPILATION \ -DG_LOG_DOMAIN=\"xfconf\" \ $(PLATFORM_CPPFLAGS) diff --git a/xfconf/xfconf-binding.c b/xfconf/xfconf-binding.c index 7e821f4..bc0a803 100644 --- a/xfconf/xfconf-binding.c +++ b/xfconf/xfconf-binding.c @@ -29,8 +29,8 @@ #include "xfconf.h" #include "xfconf-private.h" -#include "xfconf-alias.h" -#include "xfconf-common-private.h" +#include "common/xfconf-alias.h" +#include "common/xfconf-common-private.h" typedef struct diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c index 71d57a0..06c1b56 100644 --- a/xfconf/xfconf-cache.c +++ b/xfconf/xfconf-cache.c @@ -30,10 +30,10 @@ #include "xfconf-channel.h" #include "xfconf-errors.h" #include "xfconf-dbus-bindings.h" -#include "xfconf-gvaluefuncs.h" +#include "common/xfconf-gvaluefuncs.h" #include "xfconf-private.h" -#include "xfconf-marshal.h" -#include "xfconf-common-private.h" +#include "common/xfconf-marshal.h" +#include "common/xfconf-common-private.h" #if 0 #include "xfconf-types.h" #include "xfconf.h" diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c index ba8a43d..43faa70 100644 --- a/xfconf/xfconf-channel.c +++ b/xfconf/xfconf-channel.c @@ -29,13 +29,13 @@ #include "xfconf-channel.h" #include "xfconf-cache.h" #include "xfconf-dbus-bindings.h" -#include "xfconf-gvaluefuncs.h" +#include "common/xfconf-gvaluefuncs.h" #include "xfconf-private.h" -#include "xfconf-marshal.h" +#include "common/xfconf-marshal.h" #include "xfconf-types.h" -#include "xfconf-common-private.h" +#include "common/xfconf-common-private.h" #include "xfconf.h" -#include "xfconf-alias.h" +#include "common/xfconf-alias.h" #define IS_SINGLETON_DEFAULT TRUE diff --git a/xfconf/xfconf.c b/xfconf/xfconf.c index 64e2719..b412099 100644 --- a/xfconf/xfconf.c +++ b/xfconf/xfconf.c @@ -31,7 +31,7 @@ #include <dbus/dbus-glib.h> #include "xfconf.h" -#include "xfconf-marshal.h" +#include "common/xfconf-marshal.h" #include "xfconf-private.h" #include "common/xfconf-alias.h" diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am index 7a1e66d..e118ee4 100644 --- a/xfconfd/Makefile.am +++ b/xfconfd/Makefile.am @@ -1,9 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/common \ - -I$(top_builddir) \ - -I$(top_builddir)/common \ -DG_LOG_DOMAIN=\"xfconfd\" \ -DLIBXFCONF_COMPILATION \ -DBINDIR=\"$(bindir)\" \ diff --git a/xfconfd/xfconf-backend-perchannel-xml.c b/xfconfd/xfconf-backend-perchannel-xml.c index e398d8c..34c40e8 100644 --- a/xfconfd/xfconf-backend-perchannel-xml.c +++ b/xfconfd/xfconf-backend-perchannel-xml.c @@ -57,9 +57,9 @@ #include "xfconf-backend-perchannel-xml.h" #include "xfconf-backend.h" #include "xfconf-locking-utils.h" -#include "xfconf-gvaluefuncs.h" +#include "common/xfconf-gvaluefuncs.h" #include "xfconf/xfconf-types.h" -#include "xfconf-common-private.h" +#include "common/xfconf-common-private.h" #define FILE_VERSION_MAJOR "1" #define FILE_VERSION_MINOR "0" diff --git a/xfconfd/xfconf-daemon.c b/xfconfd/xfconf-daemon.c index 17bbd3a..f416e1a 100644 --- a/xfconfd/xfconf-daemon.c +++ b/xfconfd/xfconf-daemon.c @@ -29,10 +29,10 @@ #include "xfconf-daemon.h" #include "xfconf-backend-factory.h" #include "xfconf-backend.h" -#include "xfconf-marshal.h" -#include "xfconf-gvaluefuncs.h" +#include "common/xfconf-marshal.h" +#include "common/xfconf-gvaluefuncs.h" #include "xfconf/xfconf-errors.h" -#include "xfconf-common-private.h" +#include "common/xfconf-common-private.h" static void xfconf_set_property(XfconfDaemon *xfconfd, const gchar *channel, |