Changeset 171 for trunk/Makefile.in

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

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

trunk/Makefile.in

@@ -152 +152 @@
         $(srcsrc)/sh_portcheck.c \
         $(srcsrc)/sh_processcheck.c $(srcsrc)/sh_prelude_old.c \
-        $(srcsrc)/sh_pthread.c $(srcsrc)/sh_string.c
+        $(srcsrc)/sh_pthread.c $(srcsrc)/sh_string.c \
+        $(srcsrc)/dnmalloc.c \
+        $(srcsrc)/t-test1.c
 
 OBJECTS = sh_files.o sh_tiger0.o sh_tiger2.o sh_tiger2_64.o \
@@ -166 +168 @@
         sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o \
         sh_processcheck.o sh_portcheck.o sh_prelude_old.o \
-        sh_pthread.o sh_string.o
+        sh_pthread.o sh_string.o dnmalloc.o
 
 KERN = kern_head.h kern_head.c
@@ -354 +356 @@
 TESTCLEANFILES = samhain.build samhain.new yule.html \
         test_ext test_ext.c test_ext.res testhash.tmp \
-        testrc1.signed testrc_1ext testrc_2 testrc_2.signed 
+        testrc1.signed testrc_1ext testrc_2 testrc_2.signed \
+        test_dnmalloc 
 
 distclean:  clean
@@ -425 +428 @@
           chmod +x test/test.sh; \
         fi
+
+test_dnmalloc: $(srcsrc)/t-test1.c dnmalloc.o
+        $(COMPILE) $(VFLAG) -o t-test1.o -c $(srcsrc)/t-test1.c; \
+        $(LINK) t-test1.o dnmalloc.o $(LIBS_TRY)
+
 
 #----------------------------------------------------------
@@ -1179 +1187 @@
         test -f ./intcutest && mv ./intcutest ./cutest; \
         ./cutest
+
+runcutest:
+        gdb ./cutest
 
 samhain_hide.o: $(srcsrc)/samhain_hide.c samhain_erase.o
@@ -1701 +1712 @@
 sh_pthread.o: $(srcsrc)/sh_pthread.c Makefile config_xor.h $(srcinc)/sh_pthread.h $(srcinc)/sh_calls.h $(srcinc)/sh_modules.h 
 sh_string.o: $(srcsrc)/sh_string.c Makefile config_xor.h $(srcinc)/sh_string.h $(srcinc)/sh_mem.h $(srcinc)/CuTest.h 
+dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h 
+t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h