Changeset 14 for floppyfw/Makefile

Timestamp:

12/29/05 23:31:25 (7 years ago)

Author:

root

Message:

Many changes from Christian.

Files:

• floppyfw/Makefile (modified) (7 diffs)

floppyfw/Makefile

@@ -76 +76 @@
 
 # For SMP machines some stuff can be run in parallel
-JLEVEL=-j2
+# This one sets j<amount of CPUs> but it may be just as good or even better
+# with amount +1
+JLEVEL=-j$(shell expr `grep -i -c '^processor[[:space:]]*:[[:space:]]*[0-9]\+' /proc/cpuinfo` +1)
 
 # Sourceforge-mirror:
 SF_HOST=voxel
-SF_MIRROR=http://$(SF_MIRROR).dl.sourceforge.net
+SF_MIRROR=http://$(SF_HOST).dl.sourceforge.net
 
 
@@ -98 +100 @@
 # I could have used base but some of the patches has a problem.
 # It's alot here, probably not so smart, cut back later.
-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
-
-# These are the ones from above minus those not in the newest p-o-m (plus a 
-# few nwe ones):
-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
+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 connrate msnp-conntrack-nat nth sip-conntrack-nat set expire psd time TARPIT
+
+# After switching to a newer p-o-m;
+# 
 # Did not apply cleanly: dropped-table tproxy
 #
@@ -204 +205 @@
 
 TARFLAGS=--format oldgnu
+
+#TAR_VERBOSE=--verbose
+RM=-rm -f
+
 # This may be a problem to use but I'll try.
 # --strip-unneeded
 STRIP=strip --strip-unneeded -g --remove-section=.comment --remove-section=.note 
-SSTRIP=sstrip
-DEPMOD=(cd $(LINUX_DIR) ; /sbin/depmod -ae -F System.map -b $(MODULES_DIR) \
-                -r $(LINUX_VERSION))
+SSTRIP=$(shell command type sstrip >/dev/null 2>&1 && echo sstrip || echo $(STRIP))
+DEPMOD=(cd $(LINUX_DIR); \
+        /sbin/depmod -ae -F System.map -b $(MODULES_DIR) -r $(LINUX_VERSION))
+
+
+
 # SED=/bin/sed -i -e
 SED=/usr/bin/perl -p -i -e
@@ -269 +277 @@
 $(ADD_MASTER):
         cp -a $(ADD_DIR)/skeleton $(ADD_MASTER)
-        -find $(ADD_MASTER) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
-        -find $(ADD_MASTER) -type d -name .svn -exec rm -rf {} \; > /dev/null 2>&1
+        -find $(ADD_MASTER) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1
+        -find $(ADD_MASTER) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1
 
 $(INITRD_MASTER):
         cp -a $(INITRD_DIR)/skeleton $(INITRD_MASTER)
-        -find $(INITRD_MASTER) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
-        -find $(INITRD_MASTER) -type d -name .svn -exec rm -rf {} \; > /dev/null 2>&1
+        -find $(INITRD_MASTER) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1
+        -find $(INITRD_MASTER) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1
 
 source: $(TARGETS_SOURCE)
@@ -287 +295 @@
 #############################################################
 clean: $(TARGETS_CLEAN)
-        rm -rf $(INITRD_MASTER) $(ADD_MASTER) 
+        $(RM) -r $(INITRD_MASTER) $(ADD_MASTER) 
 
 dirclean: $(TARGETS_DIRCLEAN)
-        rm -rf $(INITRD_MASTER) $(ADD_MASTER) 
+        $(RM) -r $(INITRD_MASTER) $(ADD_MASTER) 
 
 distclean:
-        rm -rf $(DL_DIR) $(BUILD_DIR)
+        $(RM) -r $(DL_DIR) $(BUILD_DIR)
 
 sourceball: 
-        rm -rf $(BUILD_DIR)
+        $(RM) -r $(BUILD_DIR)
         set -e; \
         cd ..; \
-        rm -f buildroot.tar.bz2; \
+        $(RM) buildroot.tar.bz2; \
         tar -cvf buildroot.tar buildroot; \
-        bzip2 -9 buildroot.tar; \
+        bzip2 -9 buildroot.tar
 
 list-targets:
+        @(echo "DIRS:"; \
+                for t in $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) \
+                $(MODULES_BASE_DIR) $(MODULES_DIR) \
+                $(ADD_MASTER) $(INITRD_MASTER) $(PACKAGES_DIR); do \
+                echo -e "\t$$t"; \
+          done \
+        )
         @echo "TARGETS:"
         @(for t in $(TARGETS); do \
@@ -309 +324 @@
           done \
         )
+        @echo "TARGETS_SOURCE:"
+        @(for t in $(TARGETS_SOURCE); do \
+                echo -e "\t$$t"; \
+          done \
+        )
         @echo "TARGETS_CLEAN:"
         @(for t in $(TARGETS_CLEAN); do \
@@ -319 +339 @@
           done \
         )
-        @echo "TARGETS_SOURCE:"
-        @(for t in $(TARGETS_SOURCE); do \
-                echo -e "\t$$t"; \
-          done \
-        )