## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.37 2000/07/29 10:02:36 mdw Exp $
+## $Id: Makefile.m4,v 1.38 2000/07/29 10:54:55 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## Revision 1.38 2000/07/29 10:54:55 mdw
+## Further fixing to support building using normal `make' again. ;-) I
+## think we're there now.
+##
## Revision 1.37 2000/07/29 10:02:36 mdw
## Lots of fixing to support `make -j' building.
##
cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
echo datestamp >modes-stamp
-define(`tables', `dnl
+define(`gen_tables', `dnl
_(des) _(blowfish) _(twofish) _(square) _(rijndael) _(tiger) dnl
_(gfshare)')
-autoheaders: addsuffix(tables, `-tab.h') primetab.h mptypes.h
+autoheaders: addsuffix(`gen_tables', `-tab.h') primetab.h mptypes.h
define(`emit', `
_item`'-tab.h: _item`'-mktab
./_item`'-mktab >_item`'-tab.h')dnl
-tables
+gen_tables
primetab.h: primetab.c
primetab.c: genprimes
addsuffix(`cipher_modes', `-def.h') \
addsuffix(`hash_modes', `-def.h')
-define(`lib_sources', `\
+libcatacomb_la_SOURCES = \
grand.c keysz.c \
des-base.c des-base.h \
cast-s.c cast-sk.c cast-base.h cast-tab.h \
rho.c \
key-data.c key-flags.c key-text.c key-binary.c key-pass.c \
key-pack.c key-misc.c key-file.c key-attr.c key-io.c key-moan.c \
- key-error.c key-fetch.c')
-LIBSRC = lib_sources
-libcatacomb_la_SOURCES = \
- lib_sources \
+ key-error.c key-fetch.c \
primetab.c \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
rijndael.lo: rijndael-tab.h
tiger.lo: tiger-tab.h
gfshare.lo: gfshare-tab.h
-$(LIBSRC) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
+$(libcatacomb_la_OBJECTS) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
## --- Utility programs ---
CLEANFILES = \
*.t *.to \
mptypes.h primetab.c primetab.h \
- des-tab.h twofish-tab.h blowfish-tab.h gfshare-tab.h rijndael-tab.h
+ addsuffix(`gen_tables', `-tab.h')
## --- Makefile building (haha!) ---