Changeset 579

Show
Ignore:
Timestamp:
08/15/08 12:16:58
Author:
rachel
Message:

Allow user to specify location of dmalloc.
Stop make on error.
Use $(MAKE) rather make in makefiles

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openpgpsdk/trunk/Makefile

    r575 r579  
    66 
    77headers: 
    8         cd include/openpgpsdk && make headers 
     8        cd include/openpgpsdk && $(MAKE) -wS headers 
     9 
     10#(cd $$d; echo "+++ make in $$d"; $(MAKE) -wS; echo "--- $$d"); \ 
    911 
    1012default: 
    1113        @set -e; for d in $(SUBDIRS); do \ 
    12         (cd $$d; echo "+++ make in $$d"; make -w; echo "** submake returns $$?\n"; echo "--- $$d"); \ 
     14        $(MAKE) -w -S -C $$d; \ 
    1315        done 
    1416 
    …… 
    1820force_depend: 
    1921        @set -e; for d in $(SUBDIRS); do \ 
    20         (cd $$d; echo "+++ make force_depend in $$d"; make force_depend ; echo "--- $$d"); \ 
     22        (cd $$d; echo "+++ make force_depend in $$d"; $(MAKE) force_depend ; echo "--- $$d"); \ 
    2123        done 
    2224 
    2325clean: 
    2426        @set -e; for d in $(SUBDIRS); do \ 
    25         (cd $$d; echo "+++ make clean in $$d"; make clean; echo "--- $$d"); \ 
     27        (cd $$d; echo "+++ make clean in $$d"; $(MAKE) clean; echo "--- $$d"); \ 
    2628        done 
    2729        find . -name '*.core' | xargs rm -f 
    …… 
    3335Makefiles: 
    3436        @set -e; for d in $(SUBDIRS); do \ 
    35         (cd $$d; echo "+++ make Makefile in $$d"; make Makefile; echo "--- $$d"); \ 
     37        (cd $$d; echo "+++ make Makefile in $$d"; $(MAKE) Makefile; echo "--- $$d"); \ 
    3638        done 
    3739 
    …… 
    4143 
    4244test:: 
    43         cd tests && make  
     45        cd tests && $(MAKE)  
    4446 
    4547doc:: 
    46         cd doc && make 
     48        cd doc && $(MAKE) 
    4749 
    4850cunit: 

  • openpgpsdk/trunk/configure

    r577 r579  
    3232my %Args=( 
    3333          '--help' => \&usage, 
    34           '--use-dmalloc' => sub { 
    35               $Subst{DM_FLAGS}='-I/usr/local/include -DDMALLOC'; 
    36               $Subst{DM_LIB}='/usr/local/lib/libdmalloc.a'; 
     34          '--with-dmalloc=' => sub { 
     35          my $loc=shift; 
     36              $Subst{DM_FLAGS}="-I $loc/include -DDMALLOC"; 
     37              $Subst{DM_LIB}="$loc/lib/libdmalloc.a"; 
    3738          }, 
    3839          '--with-openssl=' => sub { 
    …… 
    371372    my $flags=''; 
    372373    if(getKnowledge('is_gcc')) { 
    373         $flags='-Wall -Werror -W -g'; 
     374        $flags='-Wall -Wno-always-true -Werror -W -g '; 
    374375#       my $v=getKnowledge('gcc_major'); 
    375376#       $flags.=' -Wdeclaration-after-statement' if $v >= 3; 

  • openpgpsdk/trunk/include/openpgpsdk/Makefile

    r241 r579  
    22 
    33top: 
    4         cd ../.. && make 
     4        $(MAKE) -C ../..  
    55 
    66headers: packet-show-cast.h 

  • openpgpsdk/trunk/src/Makefile.template

    r545 r579  
    44default: Makefile 
    55        @set -e; for d in $(SUBDIRS); do \ 
    6         (cd $$d; echo "+++ make in $$d"; make; echo "--- $$d"); \ 
     6        (cd $$d; echo "+++ make in $$d"; $(MAKE); echo "--- $$d"); \ 
    77        done 
    88 
    99lib: Makefile 
    1010        @set -e; for d in $(LIBSUBDIRS); do \ 
    11         (cd $$d; echo "+++ make in $$d"; make; echo "--- $$d"); \ 
     11        (cd $$d; echo "+++ make in $$d"; $(MAKE); echo "--- $$d"); \ 
    1212        done 
    1313 
    1414force_depend: 
    1515        @set -e; for d in $(SUBDIRS); do \ 
    16         (cd $$d; echo "+++ make force_depend in $$d"; make force_depend ; echo "--- $$d"); \ 
     16        (cd $$d; echo "+++ make force_depend in $$d"; $(MAKE) force_depend ; echo "--- $$d"); \ 
    1717        done 
    1818 
    1919clean: 
    2020        @set -e; for d in $(SUBDIRS); do \ 
    21         (cd $$d; echo "+++ make clean in $$d"; make clean; echo "--- $$d"); \ 
     21        (cd $$d; echo "+++ make clean in $$d"; $(MAKE) clean; echo "--- $$d"); \ 
    2222        done 
    2323        find . -name '*.core' | xargs rm -f 
    …… 
    2626Makefiles: 
    2727        @set -e; for d in $(SUBDIRS); do \ 
    28         (cd $$d; echo "+++ make Makefile in $$d"; make Makefile; echo "--- $$d"); \ 
     28        (cd $$d; echo "+++ make Makefile in $$d"; $(MAKE) Makefile; echo "--- $$d"); \ 
    2929        done 
    3030 

  • openpgpsdk/trunk/src/app/Makefile.template

    r557 r579  
    1515 
    1616headers: 
    17         cd ../../include/openpgpsdk && make headers 
     17        $(MAKE) -w -S -C ../../include/openpgpsdk headers 
    1818 
    1919$(LIBDEPS): 
    20         cd ../ && make lib 
     20        $(MAKE) -w -S -C ../ lib 
    2121 
    2222openpgp: openpgp.o $(LIBDEPS) 

  • openpgpsdk/trunk/src/lib/Makefile.template

    r574 r579  
    2222 
    2323headers: 
    24         cd ../../include/openpgpsdk && make headers 
     24        cd ../../include/openpgpsdk && $(MAKE) headers 
    2525 
    2626lib: $(LIBOBJS)