better core algorithm selection and new core alg suites

[chiark-tcl.git] / base / troglodyte-Makefile

diff --git a/base/troglodyte-Makefile b/base/troglodyte-Makefile
index ce81f6b16092f76d8b2a9685af7744574d163ed7..d84d43e3d5a32f18bcb33243c0af935eb1b4fb04 100644 (file)
--- a/base/troglodyte-Makefile
+++ b/base/troglodyte-Makefile
@@ -1,11 +1,14 @@
 OBJS=          tables.o \
                hbytes.o \
                enum.o \
+               ulongs.o \
+               sockaddr.o \
+               dgram.o \
                chop.o \
                hook.o \
                bcmode.o \
-               blockciph.o \
-               serpent.o \
+               misc.o \
+               algtables.o \
                crypto.o \
                parse.o
 
@@ -16,16 +19,26 @@ AUTO_HDRS=  tables.h
 AUTO_SRCS=     tables.c
 AUTOS=         $(AUTO_HDRS) $(AUTO_SRCS)
 
-TARGETS=       hbytes.so
+TARGETS=       hbytes.so autocode.tcl autococo.tcl
 
-CFLAGS=                -g -Wall $(OPTIMISE)
+CC_CRYPTO=     $(CC) $(CFLAGS) $(CPPFLAGS) -O3
+CPPFLAGS=      -I../plocal/include $(TCL_MEM_DEBUG) $(CMDLINE_CPPFLAGS)
+LDFLAGS=       -L../plocal/lib
+LDLIBS=                -lnettle
+CFLAGS=                -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
+               $(OPTIMISE)
 OPTIMISE=      -O2
+TCL_MEM_DEBUG= -DTCL_MEM_DEBUG
 
 all:           $(TARGETS) $(AUTOS)
 
 hbytes.so:     $(OBJS)
                $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $(OBJS) $(LDLIBS)
 
+autoco%.tcl:   deco%gen.tcl decobogen.tcl general.tcl ./hbytes.so \
+                       protocol.deco
+               ./$< protocol.deco >$@.new && mv -f $@.new $@           
+
 %.c:           %.tct tcmdifgen
                ./tcmdifgen -wc -o$@ $<
 
@@ -35,5 +48,8 @@ hbytes.so:    $(OBJS)
 %.o:           %.c $(HDRS)
                $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 
+#alg.o:                alg.c alg.h alg2.h
+#              $(CC_CRYPTO) -o $@ -c $<
+
 clean:
                rm -f $(OBJS) $(TARGETS) *~ ./#*#