Changeset 541

Show
Ignore:
Timestamp:
02/10/08 11:31:27
Author:
rachel
Message:

CUnit only needs to be compiled once, not every time we make clean.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openpgpsdk/trunk/Makefile

    r497 r541  
    2828        rm -rf oink-links 
    2929        -rm lib/* 
     30        # reinstall the CUnit libs 
     31        (cd CUnit-2.1-0; make install) 
    3032 
    3133Makefiles: 
    …… 
    4446        cd doc && make 
    4547 
     48cunit: 
     49        if [ ! -d CUnit-2.1-0 ]; then \ 
     50                tar xvfz CUnit-2.1-0-src.tar.gz; \ 
     51                (cd CUnit-2.1-0 && ./configure --prefix $(PWD) && make && make install); \ 
     52        fi 
     53 
     54 
    4655coverity:: 
    4756        cov-build --dir coverity make 

  • openpgpsdk/trunk/configure

    r449 r541  
    142142fileSubst('include/openpgpsdk/configure.h','/*','*/'); 
    143143 
     144print "make cunit\n"; 
     145system('make cunit') == 0 || exit; 
    144146print "make clean\n"; 
    145147system('make clean') == 0 || exit; 

  • openpgpsdk/trunk/tests/Makefile.template

    r532 r541  
    2121TESTOBJ= $(TESTSRC:.c=.o) 
    2222 
    23 all: Makefile $(CUNIT_LIB) .depend tests 
     23all: Makefile .depend tests 
    2424 
    2525tests: $(CUNIT_LIB) $(TESTOBJ) $(COMMONTESTOBJ) $(LIBDEPS) 
    2626        $(CC) $(LDFLAGS) -o tests $(TESTOBJ) $(COMMONTESTOBJ) $(LIBS) 
    27  
    28 $(CUNIT_LIB): 
    29         tar xvfz CUnit-2.1-0-src.tar.gz 
    30         (cd CUnit-2.1-0 && ./configure --prefix $(PWD)/../ && make && make install) 
    3127 
    3228clean: