projects
/
u
/
mdw
/
catacomb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a1a3a8
)
Further fixing to support building using normal `make' again. ;-) I
author
mdw
<mdw>
Sat, 29 Jul 2000 10:54:55 +0000
(10:54 +0000)
committer
mdw
<mdw>
Sat, 29 Jul 2000 10:54:55 +0000
(10:54 +0000)
think we're there now.
Makefile.m4
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.m4
b/Makefile.m4
index
8c5d32a
..
a3e8508
100644
(file)
--- a/
Makefile.m4
+++ b/
Makefile.m4
@@
-1,6
+1,6
@@
## -*-makefile-*-
##
## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.3
7 2000/07/29 10:02:36
mdw Exp $
+## $Id: Makefile.m4,v 1.3
8 2000/07/29 10:54:55
mdw Exp $
##
## Makefile for Catacomb
##
##
## Makefile for Catacomb
##
@@
-29,6
+29,10
@@
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
##----- 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.
##
## Revision 1.37 2000/07/29 10:02:36 mdw
## Lots of fixing to support `make -j' building.
##
@@
-194,15
+198,15
@@
modes-stamp: genmodes
cd $(srcdir); ./genmodes "lit(`hashes')" "lit(`hash_modes')"
echo datestamp >modes-stamp
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)')
_(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
define(`emit', `
_item`'-tab.h: _item`'-mktab
./_item`'-mktab >_item`'-tab.h')dnl
-tables
+
gen_
tables
primetab.h: primetab.c
primetab.c: genprimes
primetab.h: primetab.c
primetab.c: genprimes
@@
-245,7
+249,7
@@
pkginclude_HEADERS = \
addsuffix(`cipher_modes', `-def.h') \
addsuffix(`hash_modes', `-def.h')
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 \
grand.c keysz.c \
des-base.c des-base.h \
cast-s.c cast-sk.c cast-base.h cast-tab.h \
@@
-271,10
+275,7
@@
define(`lib_sources', `\
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 \
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') \
primetab.c \
addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
@@
-287,7
+288,7
@@
square.lo: square-tab.h
rijndael.lo: rijndael-tab.h
tiger.lo: tiger-tab.h
gfshare.lo: gfshare-tab.h
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 ---
## --- Utility programs ---
@@
-419,7
+420,7
@@
TESTS = serpent-check testprogs
CLEANFILES = \
*.t *.to \
mptypes.h primetab.c primetab.h \
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!) ---
## --- Makefile building (haha!) ---