diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-05-13 22:39:09 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-07-08 18:08:41 +0200 |
| commit | 176924344174f1510c3b5caa52399170d225acfc (patch) | |
| tree | 55ed7964f608fefce5c53db98ae6434af9ba0455 /tool | |
| parent | e1e311edaa7c153e9d20ef21c6ce4851b9ee2715 (diff) | |
| download | gnome-keyring-176924344174f1510c3b5caa52399170d225acfc.tar.gz | |
Remove support for GTK+2.
* Simplifies things going forward. Now that GTK+3 is in stable distros
we can depend on it.
* This was raised on the mailing list a while back.
https://bugzilla.gnome.org/show_bug.cgi?id=650144
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/Makefile.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tool/Makefile.am b/tool/Makefile.am index 2960e89f..eccd5506 100644 --- a/tool/Makefile.am +++ b/tool/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS= \ - gnome-keyring@GCR_VERSION_SUFFIX@ + gnome-keyring-@GCR_MAJOR@ INCLUDES= \ -I$(top_srcdir) \ @@ -9,18 +9,18 @@ INCLUDES= \ $(GLIB_CFLAGS) \ -DGCK_API_SUBJECT_TO_CHANGE -gnome_keyring@GCR_VERSION_SUFFIX@_SOURCES = \ +gnome_keyring_@GCR_MAJOR@_SOURCES = \ gkr-tool.c gkr-tool.h \ gkr-tool-import.c \ gkr-tool-trust.c \ gkr-tool-version.c -gnome_keyring@GCR_VERSION_SUFFIX@_CFLAGS = \ +gnome_keyring_@GCR_MAJOR@_CFLAGS = \ -DGCR_API_SUBJECT_TO_CHANGE \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -gnome_keyring@GCR_VERSION_SUFFIX@_LDADD = \ - $(top_builddir)/gcr/libgcr@GCR_VERSION_SUFFIX@.la \ +gnome_keyring_@GCR_MAJOR@_LDADD = \ + $(top_builddir)/gcr/libgcr-@GCR_MAJOR@.la \ $(top_builddir)/egg/libegg.la \ $(top_builddir)/gck/libgck.la \ $(GTHREAD_LIBS) \ @@ -28,8 +28,6 @@ gnome_keyring@GCR_VERSION_SUFFIX@_LDADD = \ $(GCRYPT_LIBS) \ $(DAEMON_LIBS) -# Install a link from gnome-keyring → gnome-keyring@GCR_VERSION_SUFFIX@ to maintain compatibility -if WITH_GTK3 +# Install a link from gnome-keyring > gnome-keyring-@GCR_MAJOR@ to maintain compatibility install-exec-hook: - @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring@GCR_VERSION_SUFFIX@ gnome-keyring) -endif + @test -e "$(DESTDIR)$(bindir)/gnome-keyring" || (cd $(DESTDIR)$(bindir) && $(LN_S) gnome-keyring-@GCR_MAJOR@ gnome-keyring) |