X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/7db733d4d0fd085313e4ae3d8ff9b7cc533616bb..ba6e6b64033b1f9de49feccb5c9cd438354481f7:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98c246a..11251fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,13 +62,14 @@ dist_man_MANS		 =
 ### Standard configuration substitutions.
 
 ## Substitute tags in files.
-confsubst = $(top_srcdir)/confsubst
-EXTRA_DIST		+= confsubst
+confsubst = $(top_srcdir)/config/confsubst
+EXTRA_DIST		+= config/confsubst
 
 SUBSTITUTIONS = \
 		prefix=$(prefix) exec_prefix=$(exec_prefix) \
 		libdir=$(libdir) includedir=$(includedir) \
-		PACKAGE=$(PACKAGE) VERSION=$(VERSION)
+		PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+		CATACOMB_LIBS="$(CATACOMB_LIBS)"
 
 V_SUBST = $(V_SUBST_$(V))
 V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
@@ -79,7 +80,7 @@ SUBST = $(V_SUBST)$(confsubst)
 ### The main library.
 
 lib_LTLIBRARIES		+= libcatacomb.la
-libcatacomb_la_LIBADD	 = $(CATACOMB_LIBS)
+libcatacomb_la_LIBADD	 = $(CATACOMB_LIBS) $(mLib_LIBS)
 libcatacomb_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO)
 libcatacomb_la_SOURCES	 =
 nodist_libcatacomb_la_SOURCES =
@@ -117,6 +118,7 @@ pkginclude_HEADERS	+= paranoia.h
 ## information gathered by `configure'.
 noinst_LTLIBRARIES	+= libmpbase.la
 libcatacomb_la_LIBADD	+= libmpbase.la
+libmpbase_la_LIBADD	 = $(mLib_LIBS)
 libmpbase_la_SOURCES	 =
 $(libmpbase_la_OBJECTS): mptypes.h
 
@@ -276,6 +278,7 @@ nodist_libcatacomb_la_SOURCES += primetab.c
 CLEANFILES		+= primetab.h primetab.c
 BUILT_SOURCES		+= primetab.h primetab.c
 noinst_PROGRAMS		+= genprimes
+genprimes_LDADD		 = $(mLib_LIBS)
 primetab.h: primetab.c
 primetab.c: genprimes$e
 	$(AM_V_GEN)./genprimes -hprimetab.h -cprimetab.c \
@@ -321,6 +324,7 @@ nodist_pkginclude_HEADERS += wheel.h
 nodist_libcatacomb_la_SOURCES += wheel.c
 CLEANFILES		+= wheel.h wheel.c
 noinst_PROGRAMS		+= genwheel
+genwheel_LDADD		 = $(mLib_LIBS)
 wheel.h: wheel.c
 wheel.c: genwheel$e
 	$(AM_V_GEN)./genwheel -hwheel.h -cwheel.c \
@@ -512,6 +516,7 @@ BLKCS			+= blowfish
 blowfish.lo: blowfish-tab.h
 CLEANFILES		+= blowfish-tab.h
 noinst_PROGRAMS		+= blowfish-mktab
+blowfish_mktab_CPPFLAGS	 = $(AM_CPPFLAGS) -DQUIET
 blowfish-tab.h: blowfish-mktab$e
 	$(AM_V_GEN)./blowfish-mktab >blowfish-tab.h.new && \
 		mv blowfish-tab.h.new blowfish-tab.h
@@ -1008,7 +1013,7 @@ libcatcrypt_la_SOURCES	+= getdate.y
 ###--------------------------------------------------------------------------
 ### Utility programs.
 
-UTILS_LIBS		 = libcatcrypt.la libcatacomb.la $(LIBS)
+UTILS_LIBS		 = libcatcrypt.la libcatacomb.la $(mLib_LIBS) $(LIBS)
 
 ## Generate and verify datestamped cookies.
 bin_PROGRAMS		+= cookie
@@ -1061,7 +1066,7 @@ perftest_LDADD		 = $(UTILS_LIBS)
 ## Remember passphrases for limited periods of time.
 bin_PROGRAMS		+= pixie
 pixie_SOURCES		 = pixie.c
-pixie_LDADD		 = libcatacomb.la
+pixie_LDADD		 = libcatacomb.la $(mLib_LIBS) $(PIXIE_LIBS)
 dist_man_MANS		+= pixie.1
 EXTRA_DIST		+= xpixie
 
@@ -1076,7 +1081,7 @@ SUFFIXES		+= .c .$t .to
 .c.to:
 	$(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
 .to.$t: libcatacomb.la
-	$(AM_V_CCLD)$(LINK) $< libcatacomb.la $(LIBS)
+	$(AM_V_CCLD)$(LINK) $< libcatacomb.la $(mLib_LIBS) $(LIBS)
 .PRECIOUS: %.to
 CLEANFILES		+= *.to *.$t
 
@@ -1100,7 +1105,7 @@ dist-hook::
 	echo $(VERSION) >$(distdir)/RELEASE
 
 ## Additional build tools.
-EXTRA_DIST		+= auto-version
+EXTRA_DIST		+= config/auto-version
 
 ###--------------------------------------------------------------------------
 ### Debian.