Changeset 18 for trunk/Makefile.in

Timestamp:

Jan 28, 2006, 9:07:52 PM (19 years ago)

Author:

rainer

Message:

Optimized version of tiger algorithm, and basic ingredients for unit testing (part 2)

File:

• trunk/Makefile.in (modified) (8 diffs)

trunk/Makefile.in

@@ -57 +57 @@
 XOR_CODE = @xor_code@
 SH_LKM   = @sh_lkm@
+TIGER_SRC = @tiger_src@
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -63 +64 @@
 
 CC = @CC@
+# DBGDEF = -pg -DSH_PROFILE=1
 DBGDEF = @mydebugdef@
 DEFS = $(DBGDEF) @DEFS@ -I. -I$(top_srcdir)/include
@@ -98 +100 @@
         lzoconf.h minilzo.h rijndael-alg-fst.h rijndael-api-fst.h \
         rijndael-boxes-fst.h sh_socket.h sh_ignore.h sh_prelude.h \
-        sh_mounts.h sh_userfiles.h sh_static.h sh_prelink.h
+        sh_mounts.h sh_userfiles.h sh_static.h sh_prelink.h 
 
 
@@ -130 +132 @@
         $(srcsrc)/sh_userfiles.c $(srcsrc)/sh_prelude.c \
         $(srcsrc)/sh_prelink.c $(srcsrc)/sh_static.c \
-        $(srcsrc)/sh_prelude_old.c
-
-OBJECTS = samhain.o sh_unix.o sh_utils.o sh_error.o sh_files.o \
-        sh_getopt.o sh_readconf.o sh_tiger0.o sh_tiger1.o sh_tiger2.o \
-        sh_tiger1_64.o sh_tiger2_64.o sh_hash.o sh_mail.o sh_mem.o \
+        $(srcsrc)/sh_prelude_old.c 
+
+OBJECTS = sh_files.o sh_tiger0.o sh_tiger2.o sh_tiger2_64.o \
+        samhain.o sh_unix.o sh_utils.o sh_error.o \
+        sh_getopt.o sh_readconf.o \
+        sh_hash.o sh_mail.o sh_mem.o \
         sh_entropy.o sh_forward.o sh_modules.o sh_utmp.o sh_kern.o \
         sh_suidchk.o sh_srp.o sh_fifo.o sh_tools.o sh_html.o sh_gpg.o \
@@ -141 +144 @@
         trustfile.o rijndael-alg-fst.o rijndael-api-fst.o slib.o \
         zAVLTree.o sh_socket.o sh_ignore.o sh_prelude.o \
-        sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o sh_prelude_old.o
+        sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o \
+        sh_prelude_old.o 
 
 KERN = kern_head.h kern_head.c
@@ -1057 +1061 @@
         rm x_`echo $@ |sed 's%\.o$$%%'`.c
 
+sh_tiger_i.o: $(srcsrc)/$(TIGER_SRC) Makefile config_xor.h 
+        @echo "$(COMPILE) $(VFLAG) -o sh_tiger_i.o -c $(srcsrc)/$(TIGER_SRC)";\
+        $(COMPILE) $(VFLAG) -o sh_tiger_i.o -c $(srcsrc)/$(TIGER_SRC);
+
 samhain_setpwd: encode config_xor.h $(srcsrc)/samhain_setpwd.c
         @echo '$(COMPILE)  -o samhain_setpwd $(srcsrc)/samhain_setpwd.c'; \
@@ -1075 +1083 @@
         rm x_yulectl.c
 
-$(SAMHAIN): internal.h $(OBJECTS)
+$(SAMHAIN): internal.h $(OBJECTS) sh_tiger_i.o
         @-rm -f $(SAMHAIN)
-        @echo "$(LINK) $(OBJECTS) $(LIBS_TRY)"; \
-        $(LINK) $(OBJECTS) $(LIBS_TRY)
-
-
+        @echo "$(LINK) sh_tiger_i.o $(OBJECTS) $(LIBS_TRY)"; \
+        $(LINK) sh_tiger_i.o $(OBJECTS) $(LIBS_TRY)
+
+
+CUTEST_SOURCES = $(srcsrc)/cutest_sh_tools.c \
+                $(srcsrc)/cutest_zAVLTree.c \
+                $(srcsrc)/cutest_sh_tiger0.c
+
+CUTEST_OBJECTS = cutest_sh_tools.o cutest_zAVLTree.o cutest_sh_tiger0.o
+
+$(CUTEST_OBJECTS): $(CUTEST_SOURCES)
+        @echo "./encode $(XOR_CODE) $(srcsrc)/`echo $@ |sed 's%\.o$$%%'`.c --> x_`echo $@ |sed 's%\.o$$%%'`.c"; \
+        ./encode $(XOR_CODE) $(srcsrc)/`echo $@ |sed 's%\.o$$%%'`.c; \
+        echo "$(COMPILE) $(VFLAG) -o `echo $@ |sed 's%.*/%%'` -c x_`echo $@ |sed 's%\.o$$%%'`.c"; \
+        $(COMPILE) $(VFLAG) -o `echo $@ |sed 's%.*/%%'` -c x_`echo $@ |sed 's%\.o$$%%'`.c; \
+        rm x_`echo $@ |sed 's%\.o$$%%'`.c
+
+cutest: internal.h $(OBJECTS) $(CUTEST_OBJECTS) sh_tiger_i.o $(srcsrc)/make-tests.sh
+        cd $(srcsrc)/ && ./make-tests.sh >CuTestMain.c
+        @$(COMPILE) -o CuTestMain.o -c $(srcsrc)/CuTestMain.c; \
+        $(COMPILE) -o CuTest.o -c $(srcsrc)/CuTest.c; \
+        rm -f samhain.o; \
+        ./encode $(XOR_CODE) $(srcsrc)/samhain.c; \
+        $(COMPILE) $(VFLAG) -DSH_CUTEST=1 -o samhain.o -c x_samhain.c; \
+        rm x_samhain.c; \
+        $(LINK) sh_tiger_i.o $(CUTEST_OBJECTS) CuTestMain.o CuTest.o $(OBJECTS) $(LIBS_TRY); \
+        ./cutest
 
 samhain_hide.o: $(srcsrc)/samhain_hide.c samhain_erase.o
@@ -1596 +1627 @@
 sh_static.o: $(srcsrc)/sh_static.c Makefile config_xor.h 
 sh_prelude_old.o: $(srcsrc)/sh_prelude_old.c Makefile config_xor.h $(srcinc)/slib.h $(srcinc)/sh_mem.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h $(srcinc)/sh_static.h 
+sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h