aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog4
-rw-r--r--sm/Makefile.am13
2 files changed, 15 insertions, 2 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 90396e8ed..986432f2f 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-20 Werner Koch <[email protected]>
+
+ * Makefile.am: Changes to allow parallel make runs.
+
2006-09-18 Werner Koch <[email protected]>
* gpgsm.c (main): Use this to import standard certificates.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index be53e8d25..915a7bc98 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -54,9 +54,18 @@ gpgsm_SOURCES = \
qualified.c
-gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
- ../common/libcommon.a ../gl/libgnu.a \
+common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
+ ../common/libcommon.a ../gl/libgnu.a
+
+gpgsm_LDADD = $(common_libs) \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
$(LIBINTL) $(PTH_LIBS) $(ZLIBS)
+# Make sure that all libs are build before we use them. This is
+# important for things like make -j2.
+$(PROGRAMS): $(common_libs)
+
+
+
+