IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31496


Ignore:
Timestamp:
May 9, 2011, 5:37:09 AM (15 years ago)
Author:
Paul Price
Message:

Change 'make' --> so as to enable parallel make. Builds MUCH faster now

Location:
trunk/Ohana
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/Makefile.in

    r28190 r31496  
    7676        mkdir -p $(DESTLIB)
    7777        mkdir -p $(DESTBIN)
    78         for i in $(LIBS); do make $$i.install || exit 1; done
     78        for i in $(LIBS); do $(MAKE) $$i.install || exit 1; done
    7979        chmod +x ohana-config
    8080        cp -f ohana-config $(DESTBIN)/
    8181
    8282bins:
    83         for i in $(PROGRAM); do make $$i; done
     83        for i in $(PROGRAM); do $(MAKE) $$i; done
    8484
    8585all:
    86         make libs || exit 1
    87         for i in $(PROGRAM); do make $$i || exit 1; done
     86        $(MAKE) libs || exit 1
     87        for i in $(PROGRAM); do $(MAKE) $$i || exit 1; done
    8888
    8989extras:
    90         for i in $(EXTRAS); do make $$i || exit 1; done
     90        for i in $(EXTRAS); do $(MAKE) $$i || exit 1; done
    9191
    9292pantasks:
    93         make libs || exit 1
    94         cd src/opihi; make pclient.install && exit 1
    95         cd src/opihi; make pcontrol.install && exit 1
    96         cd src/opihi; make pantasks.install && exit 1
     93        $(MAKE) libs || exit 1
     94        cd src/opihi; $(MAKE) pclient.install && exit 1
     95        cd src/opihi; $(MAKE) pcontrol.install && exit 1
     96        cd src/opihi; $(MAKE) pantasks.install && exit 1
    9797
    9898mana:
    99         make libs
    100         make kapa2.install
    101         cd src/opihi; make mana.install && exit 1
     99        $(MAKE) libs
     100        $(MAKE) kapa2.install
     101        cd src/opihi; $(MAKE) mana.install && exit 1
    102102
    103103dvoshell:
    104         make libs
    105         make kapa2.install
    106         cd src/opihi; make dvo.install && exit 1
     104        $(MAKE) libs
     105        $(MAKE) kapa2.install
     106        cd src/opihi; $(MAKE) dvo.install && exit 1
    107107
    108108clean:
    109109        @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
    110         for i in $(LIBS); do make $$i.clean || exit 1; done
    111         for i in $(PROGRAM); do make $$i.clean || exit 1; done
    112         for i in $(EXTRAS); do make $$i.clean || exit 1; done
     110        for i in $(LIBS); do $(MAKE) $$i.clean || exit 1; done
     111        for i in $(PROGRAM); do $(MAKE) $$i.clean || exit 1; done
     112        for i in $(EXTRAS); do $(MAKE) $$i.clean || exit 1; done
    113113        @rm -f `find . -name .mana`
    114114        @rm -f `find . -name .dvo`
    … …  
    117117dist:
    118118        @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
    119         for i in $(LIBS); do make $$i.dist || exit 1; done
    120         for i in $(PROGRAM); do make $$i.dist || exit 1; done
     119        for i in $(LIBS); do $(MAKE) $$i.dist || exit 1; done
     120        for i in $(PROGRAM); do $(MAKE) $$i.dist || exit 1; done
    121121        @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
    122122
    123123install:
    124124        @if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
    125         for i in $(LIBS); do make $$i.install || exit 1; done
    126         for i in $(PROGRAM); do make $$i.install || exit 1; done
     125        for i in $(LIBS); do $(MAKE) $$i.install || exit 1; done
     126        for i in $(PROGRAM); do $(MAKE) $$i.install || exit 1; done
    127127        @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
    128128
    129129install.extras:
    130         for i in $(EXTRAS); do make $$i.install || exit 1; done
     130        for i in $(EXTRAS); do $(MAKE) $$i.install || exit 1; done
    131131        @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
    132132
    … …  
    135135        @if [ -d "src/$@" ]; then \
    136136          echo -n -e "\0033]0; *** Ohana: $@ *** \0007"; \
    137           (cd src/$@ && make); \
     137          (cd src/$@ && $(MAKE)); \
    138138        fi
    139139        @echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
    … …  
    142142        @echo -n -e "\0033]0; *** Ohana: $@ *** \0007" \
    143143        mkdir -p bin/$(ARCH)
    144         if [ -d "src/$*" ]; then (cd src/$* && make install); fi
     144        if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) install); fi
    145145
    146146%.clean:
    147         if [ -d "src/$*" ]; then (cd src/$* && make clean); fi
     147        if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) clean); fi
    148148
    149149%.dist:
    150         (cd src/$* && make dist)
     150        (cd src/$* && $(MAKE) dist)

  • trunk/Ohana/src/addstar/Makefile

    r29938 r31496  
    267267
    268268%.install:
    269         make $(DESTBIN)/$*
     269        $(MAKE) $(DESTBIN)/$*
    270270
    271271install:
    272         for i in $(INSTALL); do make $$i.install || exit; done
     272        for i in $(INSTALL); do $(MAKE) $$i.install || exit; done

  • trunk/Ohana/src/dvomerge/Makefile

    r29938 r31496  
    108108
    109109%.install:
    110         make $(DESTBIN)/$*
     110        $(MAKE) $(DESTBIN)/$*
    111111
    112112install:
    113         for i in $(INSTALL); do make $$i.install || exit; done
     113        for i in $(INSTALL); do $(MAKE) $$i.install || exit; done

  • trunk/Ohana/src/dvosplit/Makefile

    r15743 r31496  
    4343
    4444%.install:
    45         make $(DESTBIN)/$*
     45        $(MAKE) $(DESTBIN)/$*
    4646
    4747install:
    48         for i in $(INSTALL); do make $$i.install || exit; done
     48        for i in $(INSTALL); do $(MAKE) $$i.install || exit; done

  • trunk/Ohana/src/imregister/Makefile

    r16040 r31496  
    185185%.rebuild :
    186186        rm -f $(BIN)/$*.$(ARCH)
    187         make $(DESTBIN)/$*
     187        $(MAKE) $(DESTBIN)/$*
    188188
    189189%.install:
    190         make $(DESTBIN)/$*
     190        $(MAKE) $(DESTBIN)/$*
    191191
    192192install:
    193         for i in $(INSTALL); do make $$i.install || exit; done
     193        for i in $(INSTALL); do $(MAKE) $$i.install || exit; done

  • trunk/Ohana/src/libdvo/Makefile

    r31160 r31496  
    101101
    102102$(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h
    103         @echo "make $@ from $^"
    104         cd $(AUTO) && make $@
     103        @echo "$(MAKE) $@ from $^"
     104        cd $(AUTO) && $(MAKE) $@
    105105
    106106# generic rule for AINCS
    107107$(AINC)/%.h : $(ADEF)/%.d $(ADEF)/autocode.h $(ADEF)/common.h
    108         @echo "make $@ from $^"
    109         cd $(AUTO) && make $@
     108        @echo "$(MAKE) $@ from $^"
     109        cd $(AUTO) && $(MAKE) $@
    110110
    111111# generic rule for ASRC
    112112$(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c $(AINC)/%.h
    113         @echo "make $@ from $^"
    114         cd $(AUTO) && make $@
     113        @echo "$(MAKE) $@ from $^"
     114        cd $(AUTO) && $(MAKE) $@
    115115
    116116# generic rule for AOBJS
    117117$(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
    118         @echo "make $@ from $^"
    119         cd $(AUTO) && make $@
     118        @echo "$(MAKE) $@ from $^"
     119        cd $(AUTO) && $(MAKE) $@
    120120
    121121tabletest: install
    … …  
    124124clean: cleandef
    125125cleandef:
    126         cd $(AUTO) && make clean
     126        cd $(AUTO) && $(MAKE) clean
    127127
    128128.PRECIOUS: $(ASRC)/%.c

  • trunk/Ohana/src/libohana/Makefile

    r28241 r31496  
    5454testcode: install $(TEST)
    5555test:
    56         make testcode
     56        $(MAKE) testcode
    5757        for i in $(TEST); do $$i; done
    5858

  • trunk/Ohana/src/misc/Makefile

    r12842 r31496  
    3737
    3838cfhtlog:
    39         make $(DESTBIN)/cfhtlog
     39        $(MAKE) $(DESTBIN)/cfhtlog
    4040
    4141# copied from Makefile.Common : use a single c file: foo : foo.c
    … …  
    5656
    5757%.install:
    58         make $(DESTBIN)/$*
     58        $(MAKE) $(DESTBIN)/$*
    5959
    6060install:
    61         for i in $(PROGRAMS); do make $$i.install || exit; done
     61        for i in $(PROGRAMS); do $(MAKE) $$i.install || exit; done
    6262
    6363%.clean:

  • trunk/Ohana/src/opihi/Makefile

    r8566 r31496  
    2323
    2424all:
    25         for i in $(PROGRAM) $(SPECIAL); do make $$i || exit; done
    26         make pantasks_client
    27         make pantasks_server
     25        for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i || exit; done
     26        $(MAKE) pantasks_client
     27        $(MAKE) pantasks_server
    2828
    2929libs:
    30         for i in $(LIBS); do make $$i || exit; done
     30        for i in $(LIBS); do $(MAKE) $$i || exit; done
    3131
    3232extras:
    33         for i in $(EXTRAS); do make $$i || exit; done
     33        for i in $(EXTRAS); do $(MAKE) $$i || exit; done
    3434
    3535install:
    36         for i in $(PROGRAM) $(SPECIAL); do make $$i.install || exit; done
    37         make pantasks_client.install
    38         make pantasks_server.install
     36        for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i.install || exit; done
     37        $(MAKE) pantasks_client.install
     38        $(MAKE) pantasks_server.install
    3939
    4040extras-install:
    41         for i in $(EXTRAS); do make $$i.install || exit; done
     41        for i in $(EXTRAS); do $(MAKE) $$i.install || exit; done
    4242
    4343clean:
    44         for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.clean || exit; done
     44        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.clean || exit; done
    4545
    4646libs-uninstall:
    47         for i in $(LIBS); do make $$i.uninstall || exit; done
     47        for i in $(LIBS); do $(MAKE) $$i.uninstall || exit; done
    4848
    4949dist: clean
    50         for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.dist || exit; done
     50        for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.dist || exit; done
    5151        rm -rf bin
    5252        rm -rf lib
    … …  
    5555
    5656pantasks_client pantasks_server:
    57         if [ -d pantasks ]; then (cd pantasks && make $@); fi
     57        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
    5858
    5959pantasks_client.install: pantasks_client
    60         if [ -d pantasks ]; then (cd pantasks && make $@); fi
     60        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
    6161
    6262pantasks_server.install: pantasks_server
    63         if [ -d pantasks ]; then (cd pantasks && make $@); fi
     63        if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
    6464
    6565$(PROGRAM) $(LIBS) $(EXTRAS):
    66         if [ -d "$@" ]; then (cd $@ && make); fi
     66        if [ -d "$@" ]; then (cd $@ && $(MAKE)); fi
    6767
    6868%.install:
    69         if [ -d "$*" ]; then make $*; fi
    70         if [ -d "$*" ]; then (cd $* && make install); fi
     69        if [ -d "$*" ]; then $(MAKE) $*; fi
     70        if [ -d "$*" ]; then (cd $* && $(MAKE) install); fi
    7171
    7272%.clean:
    73         if [ -d "$*" ]; then (cd $* && make clean); fi
     73        if [ -d "$*" ]; then (cd $* && $(MAKE) clean); fi
    7474
    7575%.dist:
    76         if [ -d "$*" ]; then (cd $* && make dist); fi
     76        if [ -d "$*" ]; then (cd $* && $(MAKE) dist); fi
    7777
    7878%.uninstall:
    79         if [ -d "$*" ]; then (cd $* && make uninstall); fi
     79        if [ -d "$*" ]; then (cd $* && $(MAKE) uninstall); fi
    8080
    8181.PHONY: $(PROGRAM) $(LIBS) pantasks_server pantasks_client

  • trunk/Ohana/src/skycalc/Makefile

    r30609 r31496  
    7575
    7676%.install:
    77         make $(DESTBIN)/$*
     77        $(MAKE) $(DESTBIN)/$*
    7878
    7979install:
    80         for i in $(INSTALL); do make $$i.install || exit; done
     80        for i in $(INSTALL); do $(MAKE) $$i.install || exit; done

  • trunk/Ohana/src/tools/Makefile

    r29938 r31496  
    5757
    5858%.install:
    59         make $(DESTBIN)/$*
     59        $(MAKE) $(DESTBIN)/$*
    6060
    6161install:
    62         for i in $(PROGRAMS); do make $$i.install || exit; done
     62        for i in $(PROGRAMS); do $(MAKE) $$i.install || exit; done
    6363
    6464
Note: See TracChangeset for help on using the changeset viewer.