diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-10-06 12:51:08 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-10-06 13:22:43 +0200 |
| commit | f28d3d768f0e4057f727e8c3b93ba50c19f5db24 (patch) | |
| tree | 288ef581590dfccbfddcad3c87d98ce3a4ed0a97 /tool | |
| parent | 626eef363c0ece57713c5be5939677784e8115cc (diff) | |
| download | gnome-keyring-f28d3d768f0e4057f727e8c3b93ba50c19f5db24.tar.gz | |
Split Gcr and Gck libraries out of gnome-keyringsplit
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/Makefile.am | 19 | ||||
| -rw-r--r-- | tool/gkr-tool-import.c | 4 | ||||
| -rw-r--r-- | tool/gkr-tool-trust.c | 5 | ||||
| -rw-r--r-- | tool/gkr-tool-version.c | 5 |
4 files changed, 14 insertions, 19 deletions
diff --git a/tool/Makefile.am b/tool/Makefile.am index 0bc39129..3efac5ee 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS= \ - gnome-keyring-@GCR_MAJOR@ + gnome-keyring-@GKR_MAJOR@ INCLUDES= \ -I$(top_srcdir) \ @@ -7,28 +7,29 @@ INCLUDES= \ $(GTK_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GCK_CFLAGS) \ + $(GCR_CFLAGS) \ -DGCK_API_SUBJECT_TO_CHANGE -gnome_keyring_@GCR_MAJOR@_SOURCES = \ +gnome_keyring_@GKR_MAJOR@_SOURCES = \ gkr-tool.c gkr-tool.h \ gkr-tool-import.c \ gkr-tool-trust.c \ gkr-tool-version.c -gnome_keyring_@GCR_MAJOR@_CFLAGS = \ +gnome_keyring_@GKR_MAJOR@_CFLAGS = \ -DGCR_API_SUBJECT_TO_CHANGE \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -gnome_keyring_@GCR_MAJOR@_LDADD = \ - $(top_builddir)/gcr/libgcr-base-@GCR_MAJOR@.la \ - $(top_builddir)/gcr/libgcr-@GCR_MAJOR@.la \ +gnome_keyring_@GKR_MAJOR@_LDADD = \ $(top_builddir)/egg/libegg.la \ - $(top_builddir)/gck/libgck-@GCK_MAJOR@.la \ + $(GCK_LIBS) \ + $(GCR_LIBS) \ $(GTHREAD_LIBS) \ $(GTK_LIBS) \ $(GCRYPT_LIBS) \ $(DAEMON_LIBS) -# Install a link from gnome-keyring > gnome-keyring-@GCR_MAJOR@ to maintain compatibility +# Install a link from gnome-keyring > gnome-keyring-@GKR_MAJOR@ to maintain compatibility install-exec-hook: - @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring-@GCR_MAJOR@ gnome-keyring) + @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring-@GKR_MAJOR@ gnome-keyring) diff --git a/tool/gkr-tool-import.c b/tool/gkr-tool-import.c index 548831c5..7c0049a0 100644 --- a/tool/gkr-tool-import.c +++ b/tool/gkr-tool-import.c @@ -25,8 +25,8 @@ #include "gkr-tool.h" -#include "gck/gck.h" -#include "gcr/gcr.h" +#include <gck/gck.h> +#include <gcr/gcr.h> #include "egg/egg-hex.h" diff --git a/tool/gkr-tool-trust.c b/tool/gkr-tool-trust.c index a407d332..a9578152 100644 --- a/tool/gkr-tool-trust.c +++ b/tool/gkr-tool-trust.c @@ -25,9 +25,8 @@ #include "gkr-tool.h" -#include "gck/gck.h" - -#include "gcr/gcr.h" +#include <gck/gck.h> +#include <gcr/gcr.h> #include "egg/egg-hex.h" diff --git a/tool/gkr-tool-version.c b/tool/gkr-tool-version.c index dc1a4149..5dd10c68 100644 --- a/tool/gkr-tool-version.c +++ b/tool/gkr-tool-version.c @@ -25,11 +25,6 @@ #include "gkr-tool.h" -#include "gck/gck.h" -#include "gcr/gcr.h" - -#include "egg/egg-hex.h" - static GOptionEntry version_entries[] = { { NULL } }; |