Changeset 600

Timestamp:

08/26/08 15:41:00

Author:

rachel

Message:

Take CUnit build out of the openpgpsdk make process.
Other makefile changes to get this working on SunOS.

Files:

• openpgpsdk/trunk/Makefile (modified) (3 diffs)
• openpgpsdk/trunk/configure (modified) (2 diffs)
• openpgpsdk/trunk/include/openpgpsdk/Makefile (modified) (1 diff)
• openpgpsdk/trunk/src/app/Makefile.template (modified) (2 diffs)
• openpgpsdk/trunk/tests/Makefile.template (modified) (3 diffs)
• openpgpsdk/trunk/tests/tests.c (modified) (4 diffs)

openpgpsdk/trunk/Makefile

@@ -12 +12 @@
-default:
-        set -e; for d in $(SUBDIRS); do \
-$(MAKE) -w -C $$d || exit 1; 
+cd $$d; $(MAKE) -w || exit 1; cd ..;
-        done
-
@@ -30 +30 @@
-        rm -rf oink-links
-        -rm lib/*
-        # reinstall the CUnit libs
-        (cd CUnit-2.1-0; make install)
-
-Makefiles:
@@ -48 +46 @@
-        cd doc && $(MAKE)
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
-
-

openpgpsdk/trunk/configure

@@ -48 +48 @@
-              $Subst{INCLUDES}.=" -I $loc";
-              $Subst{ZLIB}="$loc/libz.a";
+          },
+          '--with-cunit=' => sub {
+              my $loc=shift;
+              $Subst{INCLUDES}.=" -I $loc/include";
+              $Subst{CUNITLIB}="$loc/lib/libcunit.a";
+          },
+          '--with-otherlibs=' => sub {
+              my $loc=shift;
+              $Subst{OTHERLIBS}="$loc";
-          },
-          '--log=' => sub {
@@ -138 +147 @@
-fileSubst('include/openpgpsdk/configure.h','/*','*/');
-
-print "make cunit\n";
-system('make cunit') == 0 || exit;
-print "make packet-show-cast.h\n";
-system('cd include/openpgpsdk; make packet-show-cast.h') == 0 || exit;

openpgpsdk/trunk/include/openpgpsdk/Makefile

@@ -2 +2 @@
-
-top:
-$(MAKE) -C ../.. 
+cd ../..; $(MAKE)
-
-headers: packet-show-cast.h

openpgpsdk/trunk/src/app/Makefile.template

@@ -4 +4 @@
-
-CFLAGS=-Wall -Werror -g $(DM_FLAGS) -I../../include %INCLUDES% %CFLAGS% -fPIC
-# pickup _local.h headers from advanced directory
-CFLAGS+=-I../advanced
-
-
+ 
-LIBDEPS=../../lib/libops.a
--lz -lbz2
+%ZLIB% %OTHERLIBS%
-EXES=openpgp
-
@@ -15 +13 @@
-
-headers:
-$(MAKE) -w -S -C ../../include/openpgpsdk headers
+(cd ../../include/openpgpsdk; $(MAKE) -w headers)
-
-$(LIBDEPS):
-$(MAKE) -w -S -C ../ lib
+(cd ..; $(MAKE) -w lib)
-
-openpgp: openpgp.o $(LIBDEPS)

openpgpsdk/trunk/tests/Makefile.template

@@ -3 +3 @@
-CC=%CC%
-
-CUNIT_LIB=../lib/libcunit.a
-CUNIT_INC=../include/CUnit
-
-
-CFLAGS=-Wall -Werror -g $(DM_FLAGS) -I../include %INCLUDES% %CFLAGS%
-LDFLAGS=-g %CFLAGS%
-LIBDEPS=../lib/libops.a
-$(DM_LIB) $(CUNIT_LIB)
+%CUNITLIB% %OTHERLIBS% $(DM_LIB) 
-
-COMMONTESTSRC= test_packet_types.c \
@@ -25 +21 @@
-all: Makefile .depend tests
-
-CUNIT_LIB) $(
+
-        $(CC) $(LDFLAGS) -o tests $(TESTOBJ) $(COMMONTESTOBJ) $(LIBS)
-
@@ -33 +29 @@
-        rm -f TAGS
-
- $(CUNIT_INC)
+
-        $(CC) $(CFLAGS) -E -M *.c > .depend
-

openpgpsdk/trunk/tests/tests.c

@@ -46 +46 @@
-        }
-
-    //#ifdef XXX
-    if (NULL == suite_crypto())
-        {
@@ -73 +72 @@
-        return CU_get_error();
-        }
-    //#endif
-
-    if (NULL == suite_rsa_signature()) 
@@ -81 +79 @@
-        return CU_get_error();
-        }
-
+
-    if (NULL == suite_rsa_verify()) 
-        {
@@ -102 +100 @@
-        return CU_get_error();
-        }
-    //#endif
-
-    // Run tests