Build system fixes.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 1cccc9b..de3f154 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -161,8 +161,9 @@ pkginclude_HEADERS = \
        tlsprf.h sslprf.h \
        gfshare.h share.h \
        rho.h \
-       field.h ec.h ec-exp.h ec-test.h ectab.h ec-keys.h ec-raw.h \
-       ptab.h group.h \
+       field.h field-guts.h \
+       ec.h ec-guts.h ec-exp.h ec-test.h ectab.h ec-keys.h ec-raw.h \
+       ptab.h group.h group-guts.h \
        allwithsuffix(`ciphers', `cipher_modes', `.h') \
        allwithsuffix(`hashes', `hash_modes', `.h') \
        addsuffix(`cipher_modes', `-def.h') \
@@ -240,8 +241,6 @@ mars.lo: mars-tab.h
 tiger.lo: tiger-tab.h
 gfshare.lo: gfshare-tab.h
 gfx-sqr.lo: gfx-sqr-tab.h
-patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o: \
-       mptypes.h primetab.h
 
 ## --- Utility programs ---
 
@@ -255,10 +254,13 @@ noinst_PROGRAMS = \
        addsuffix(`gen_tables', `-mktab')
 LDADD = libcatacomb.la libcatcrypt.a
 
-libcatcrypt_a_SOURCES = \
-       cc.h getdate.h \
-       cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c \
-       getdate.y
+define(`LIBCAT_SRC', `cc.h getdate.h dnl
+       cc-sig.c cc-subcmd.c cc-enc.c cc-kem.c cc-list.c')
+libcatcrypt_a_SOURCES = LIBCAT_SRC getdate.y
+
+patsubst(MP_SOURCES, `\.c\>', `.lo') dsig.o keyutil.o rspit.o \
+       patsubst(LIBCAT_SRC, `\.c\>', `.o'): \
+       mptypes.h primetab.h
        
 dsig_SOURCES = dsig.c
 cookie_SOURCES = cookie.c