diff options
| author | Richard Hughes <richard@hughsie.com> | 2013-02-04 13:23:11 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2013-02-04 13:23:11 +0000 |
| commit | 2700bfe95b4a22340071f7bb2d2c27089a1b514b (patch) | |
| tree | 20dd1a0825299e95247ede4fa989d4853a327912 /client | |
| parent | 695cfe06c06fe6785dc52f481871e71e77d0ec3d (diff) | |
| download | colord-2700bfe95b4a22340071f7bb2d2c27089a1b514b.tar.gz | |
Move libcolord into lib/colord in the project to avoid path crazyness
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 4 | ||||
| -rw-r--r-- | client/cd-common.c | 2 | ||||
| -rw-r--r-- | client/cd-create-profile.c | 2 | ||||
| -rw-r--r-- | client/cd-fix-profile.c | 4 | ||||
| -rw-r--r-- | client/cd-util.c | 7 |
5 files changed, 6 insertions, 13 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 0f44882..7ce94ee 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libcolord \ + -I$(top_srcdir)/lib \ -DG_LOG_DOMAIN=\"Cd\" \ -DCD_COMPILATION \ -DCD_DISABLE_DEPRECATED \ @@ -13,7 +13,7 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\""$(localedir)"\" COLORD_LIBS = \ - $(top_builddir)/libcolord/libcolord.la + $(top_builddir)/lib/colord/libcolord.la noinst_LIBRARIES = libclientprivate.a libclientprivate_a_SOURCES = \ diff --git a/client/cd-common.c b/client/cd-common.c index 3c98774..792723b 100644 --- a/client/cd-common.c +++ b/client/cd-common.c @@ -22,8 +22,8 @@ #include "config.h" #include <stdlib.h> +#include <colord/colord-private.h> -#include "cd-enum.h" #include "cd-common.h" #include "cd-lcms-helpers.h" diff --git a/client/cd-create-profile.c b/client/cd-create-profile.c index b57881a..c568399 100644 --- a/client/cd-create-profile.c +++ b/client/cd-create-profile.c @@ -27,8 +27,8 @@ #include <lcms2_plugin.h> #include <stdlib.h> #include <math.h> +#include <colord/colord-private.h> -#include "cd-color.h" #include "cd-common.h" #include "cd-lcms-helpers.h" diff --git a/client/cd-fix-profile.c b/client/cd-fix-profile.c index e41d115..37addee 100644 --- a/client/cd-fix-profile.c +++ b/client/cd-fix-profile.c @@ -26,12 +26,10 @@ #include <locale.h> #include <lcms2.h> #include <stdlib.h> +#include <colord/colord.h> -#include "cd-client-sync.h" #include "cd-common.h" -#include "cd-enum.h" #include "cd-lcms-helpers.h" -#include "cd-profile-sync.h" typedef struct { GOptionContext *context; diff --git a/client/cd-util.c b/client/cd-util.c index 0164e51..c000f95 100644 --- a/client/cd-util.c +++ b/client/cd-util.c @@ -27,12 +27,7 @@ #include <pwd.h> #include <stdlib.h> #include <stdio.h> - -#include "cd-client-sync.h" -#include "cd-device-sync.h" -#include "cd-enum.h" -#include "cd-profile-sync.h" -#include "cd-sensor-sync.h" +#include <colord/colord.h> typedef struct { CdClient *client; |