Changeset 14 for floppyfw/Makefile


Ignore:
Timestamp:
12/29/05 23:31:25 (9 years ago)
Author:
root
Message:

Many changes from Christian.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • floppyfw/Makefile

    r9 r14  
    7676 
    7777# For SMP machines some stuff can be run in parallel 
    78 JLEVEL=-j2 
     78# This one sets j<amount of CPUs> but it may be just as good or even better 
     79# with amount +1 
     80JLEVEL=-j$(shell expr `grep -i -c '^processor[[:space:]]*:[[:space:]]*[0-9]\+' /proc/cpuinfo` +1) 
    7981 
    8082# Sourceforge-mirror: 
    8183SF_HOST=voxel 
    82 SF_MIRROR=http://$(SF_MIRROR).dl.sourceforge.net 
     84SF_MIRROR=http://$(SF_HOST).dl.sourceforge.net 
    8385 
    8486 
     
    98100# I could have used base but some of the patches has a problem. 
    99101# It's alot here, probably not so smart, cut back later. 
    100 POM_PATCHES=string h323-conntrack-nat quake3-conntrack-nat connlimit dstlimit mport pptp-conntrack-nat directx8-conntrack-nat time cuseeme-nat rtsp-conntrack iprange random ipp2p mms-conntrack-nat CONNMARK CLASSIFY 
    101  
    102 # These are the ones from above minus those not in the newest p-o-m (plus a  
    103 # few nwe ones): 
    104 POM_PATCHES=h323-conntrack-nat quake3-conntrack-nat connlimit dstlimit mport pptp-conntrack-nat directx8-conntrack-nat time cuseeme-nat rtsp-conntrack iprange random ipp2p mms-conntrack-nat connrate msnp-conntrack-nat nth sip-conntrack-nat set expire psd time 
     102POM_PATCHES=string h323-conntrack-nat quake3-conntrack-nat connlimit dstlimit mport pptp-conntrack-nat directx8-conntrack-nat time cuseeme-nat rtsp-conntrack iprange random ipp2p mms-conntrack-nat connrate msnp-conntrack-nat nth sip-conntrack-nat set expire psd time TARPIT 
     103 
     104# After switching to a newer p-o-m; 
     105#  
    105106# Did not apply cleanly: dropped-table tproxy 
    106107# 
     
    204205 
    205206TARFLAGS=--format oldgnu 
     207 
     208#TAR_VERBOSE=--verbose 
     209RM=-rm -f 
     210 
    206211# This may be a problem to use but I'll try. 
    207212# --strip-unneeded 
    208213STRIP=strip --strip-unneeded -g --remove-section=.comment --remove-section=.note  
    209 SSTRIP=sstrip 
    210 DEPMOD=(cd $(LINUX_DIR) ; /sbin/depmod -ae -F System.map -b $(MODULES_DIR) \ 
    211                 -r $(LINUX_VERSION)) 
     214SSTRIP=$(shell command type sstrip >/dev/null 2>&1 && echo sstrip || echo $(STRIP)) 
     215DEPMOD=(cd $(LINUX_DIR); \ 
     216        /sbin/depmod -ae -F System.map -b $(MODULES_DIR) -r $(LINUX_VERSION)) 
     217 
     218 
     219 
    212220# SED=/bin/sed -i -e 
    213221SED=/usr/bin/perl -p -i -e 
     
    269277$(ADD_MASTER): 
    270278        cp -a $(ADD_DIR)/skeleton $(ADD_MASTER) 
    271         -find $(ADD_MASTER) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1 
    272         -find $(ADD_MASTER) -type d -name .svn -exec rm -rf {} \; > /dev/null 2>&1 
     279        -find $(ADD_MASTER) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1 
     280        -find $(ADD_MASTER) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1 
    273281 
    274282$(INITRD_MASTER): 
    275283        cp -a $(INITRD_DIR)/skeleton $(INITRD_MASTER) 
    276         -find $(INITRD_MASTER) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1 
    277         -find $(INITRD_MASTER) -type d -name .svn -exec rm -rf {} \; > /dev/null 2>&1 
     284        -find $(INITRD_MASTER) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1 
     285        -find $(INITRD_MASTER) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1 
    278286 
    279287source: $(TARGETS_SOURCE) 
     
    287295############################################################# 
    288296clean: $(TARGETS_CLEAN) 
    289         rm -rf $(INITRD_MASTER) $(ADD_MASTER)  
     297        $(RM) -r $(INITRD_MASTER) $(ADD_MASTER)  
    290298 
    291299dirclean: $(TARGETS_DIRCLEAN) 
    292         rm -rf $(INITRD_MASTER) $(ADD_MASTER)  
     300        $(RM) -r $(INITRD_MASTER) $(ADD_MASTER)  
    293301 
    294302distclean: 
    295         rm -rf $(DL_DIR) $(BUILD_DIR) 
     303        $(RM) -r $(DL_DIR) $(BUILD_DIR) 
    296304 
    297305sourceball:  
    298         rm -rf $(BUILD_DIR) 
     306        $(RM) -r $(BUILD_DIR) 
    299307        set -e; \ 
    300308        cd ..; \ 
    301         rm -f buildroot.tar.bz2; \ 
     309        $(RM) buildroot.tar.bz2; \ 
    302310        tar -cvf buildroot.tar buildroot; \ 
    303         bzip2 -9 buildroot.tar; \ 
     311        bzip2 -9 buildroot.tar 
    304312 
    305313list-targets: 
     314        @(echo "DIRS:"; \ 
     315                for t in $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) \ 
     316                $(MODULES_BASE_DIR) $(MODULES_DIR) \ 
     317                $(ADD_MASTER) $(INITRD_MASTER) $(PACKAGES_DIR); do \ 
     318                echo -e "\t$$t"; \ 
     319          done \ 
     320        ) 
    306321        @echo "TARGETS:" 
    307322        @(for t in $(TARGETS); do \ 
     
    309324          done \ 
    310325        ) 
     326        @echo "TARGETS_SOURCE:" 
     327        @(for t in $(TARGETS_SOURCE); do \ 
     328                echo -e "\t$$t"; \ 
     329          done \ 
     330        ) 
    311331        @echo "TARGETS_CLEAN:" 
    312332        @(for t in $(TARGETS_CLEAN); do \ 
     
    319339          done \ 
    320340        ) 
    321         @echo "TARGETS_SOURCE:" 
    322         @(for t in $(TARGETS_SOURCE); do \ 
    323                 echo -e "\t$$t"; \ 
    324           done \ 
    325         ) 
Note: See TracChangeset for help on using the changeset viewer.