Makefile.am: Use a single non-recursive Makefile

This allows all the code to be built in parallel, and only
rebuilding stuff that's changed when developing. Much quicker.

In the meantime disable the p11-tests checks, which
were very rarely used. We'll need to migrate them to TAP.

1 files changed, 11 insertions, 23 deletions

diff --git a/tool/Makefile.am b/tool/Makefile.am
index 9f51d35a..3c2bbb5a 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -1,34 +1,22 @@
-bin_PROGRAMS= \
+bin_PROGRAMS += \
 	gnome-keyring-@GKR_MAJOR@
 
-INCLUDES=	\
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
+gnome_keyring_@GKR_MAJOR@_SOURCES = \
+	tool/gkr-tool.c \
+	tool/gkr-tool.h \
+	tool/gkr-tool-import.c \
+	tool/gkr-tool-trust.c \
+	tool/gkr-tool-version.c
+gnome_keyring_@GKR_MAJOR@_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
-	$(GLIB_CFLAGS) \
 	$(GCK_CFLAGS) \
-	$(GCR_CFLAGS) \
-	-DGCK_API_SUBJECT_TO_CHANGE
-
-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_@GKR_MAJOR@_CFLAGS = \
-	-DGCR_API_SUBJECT_TO_CHANGE \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
+	$(GCR_CFLAGS)
 gnome_keyring_@GKR_MAJOR@_LDADD = \
-	$(top_builddir)/egg/libegg.la \
+	libegg.la \
 	$(GCK_LIBS) \
 	$(GCR_LIBS) \
+	$(GTK_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GCRYPT_LIBS) \
 	$(DAEMON_LIBS)
-
-# 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-@GKR_MAJOR@ gnome-keyring)