Various changes
[gnupg.git] / sm / Makefile.am
index 69a286e..f3c4564 100644 (file)
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 ## Process this file with automake to produce Makefile.in
 
 
 bin_PROGRAMS = gpgsm
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
             $(PTH_CFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
@@ -49,12 +50,22 @@ gpgsm_SOURCES = \
        import.c \
        export.c \
        delete.c \
-       certreqgen.c 
+       certreqgen.c \
+       qualified.c
+
+
+common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
+              ../common/libcommon.a ../gl/libgnu.a
+
+gpgsm_LDADD = $(common_libs) \
+              $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_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)
+
 
 
-gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a   \
-              ../common/libcommon.a ../gl/libgnu.a \
-              $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
-             $(LIBINTL) $(PTH_LIBS)