Build `mptypes.h' header file appropriately for the current

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index ae7117f..ab2225c 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.3 1999/10/24 10:04:26 mdw Exp $
+## $Id: Makefile.m4,v 1.5 1999/11/11 00:59:17 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,9 +29,16 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.3  1999/10/24 10:04:26  mdw
-## Install headers in the right directory.
+## Revision 1.5  1999/11/11 00:59:17  mdw
+## Minor reformatting.
+##
+## Revision 1.6  1999/11/11 17:47:34  mdw
+## Updates for new configuration system, and `mptypes' generator.
 ##
+## Revision 1.5  1999/11/11 00:59:17  mdw
+## Minor reformatting.
+##
+## Revision 1.4  1999/10/24 10:20:36  mdw
 ## Modify for standalone distribution.  The library's getting far too large
 ## to be sensibly embedded in other programs.
 ##
@@ -92,7 +99,6 @@ BUILT_SOURCES = \
        getdate.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
-INCLUDES = -I$(srcdir)/..
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.h')
 lib_LIBRARIES = libcatacomb.a
@@ -118,7 +124,7 @@ libcatacomb_la_SOURCES = \
        dh-prime.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 noinst_PROGRAMS = des-mktab
-LDADD = libcatacomb.a ../mLib/libmLib.a
+
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
 LDADD = libcatacomb.a
@@ -149,8 +155,9 @@ TESTS = \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.t') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.t') \
        addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
-       $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
-         $(srcdir)/$1.c libcatacomb.a ../mLib/libmLib.a -o $1.t')
+       $(COMPILE) \
+         -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
+         $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
 
 `$1.t: $1.c libcatacomb.a
        $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')