diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-25 14:43:55 +0100 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-31 15:59:46 +0100 |
| commit | 41853fa7f5af2440be5e1008ee665e0be10343fe (patch) | |
| tree | 30856662b1a97359766493deabb93b3a35722aa1 /tool | |
| parent | e84bca9dfd038b7927cb29214148e5b8aa015a42 (diff) | |
| download | gnome-keyring-41853fa7f5af2440be5e1008ee665e0be10343fe.tar.gz | |
Port to GTK+ 3
Add a --with-gtk=[2.0|3.0] option to configure to allow building against
GTK+ 2 or GTK+ 3. Closes: bgo#624570
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/.gitignore | 1 | ||||
| -rw-r--r-- | tool/Makefile.am | 16 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tool/.gitignore b/tool/.gitignore index a264247e..22f10459 100644 --- a/tool/.gitignore +++ b/tool/.gitignore @@ -1 +1,2 @@ /gnome-keyring +/gnome-keyring-1 diff --git a/tool/Makefile.am b/tool/Makefile.am index 9bb405d3..01fc9d8b 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS= \ - gnome-keyring + gnome-keyring@GCR_VERSION_SUFFIX@ INCLUDES= \ -I$(top_srcdir) \ @@ -8,19 +8,25 @@ INCLUDES= \ $(GOBJECT_CFLAGS) \ $(GLIB_CFLAGS) -gnome_keyring_SOURCES = \ +gnome_keyring@GCR_VERSION_SUFFIX@_SOURCES = \ gkr-tool.c gkr-tool.h \ gkr-tool-import.c -gnome_keyring_CFLAGS = \ +gnome_keyring@GCR_VERSION_SUFFIX@_CFLAGS = \ -DGCR_API_SUBJECT_TO_CHANGE \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -gnome_keyring_LDADD = \ +gnome_keyring@GCR_VERSION_SUFFIX@_LDADD = \ $(top_builddir)/gp11/libgp11.la \ - $(top_builddir)/gcr/libgcr.la \ + $(top_builddir)/gcr/libgcr@GCR_VERSION_SUFFIX@.la \ $(top_builddir)/egg/libegg.la \ $(GTHREAD_LIBS) \ $(GTK_LIBS) \ $(GCRYPT_LIBS) \ $(DAEMON_LIBS) + +# Install a link from gnome-keyring → gnome-keyring@GCR_VERSION_SUFFIX@ to maintain compatibility +if HAVE_GTK3 +install-exec-hook: + @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring@GCR_VERSION_SUFFIX@ gnome-keyring) +endif |