[Astlinux-commits] SF.net SVN: astlinux: [1612] trunk/package

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1612
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1612&view=rev
Author:   dhartman
Date:     2008-03-02 14:31:23 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
serveral makefile cleanups from Philip

Modified Paths:
--------------
    trunk/package/apcupsd/apcupsd.mk
    trunk/package/app_bundle/app_bundle.mk
    trunk/package/asterisk/asterisk.mk
    trunk/package/bc/bc.mk
    trunk/package/busybox/busybox.mk
    trunk/package/cvs/cvs.mk
    trunk/package/dialog/dialog.mk
    trunk/package/digiumg729/digiumg729.mk
    trunk/package/dropbear/dropbear.mk
    trunk/package/ebtables/ebtables.mk
    trunk/package/ethtool/ethtool.mk
    trunk/package/flex/flex.mk
    trunk/package/hostap/hostap.mk
    trunk/package/ipsec-tools/ipsec-tools.mk
    trunk/package/libftdi/libftdi.mk
    trunk/package/libpri/libpri.mk
    trunk/package/linux-atm/linux-atm.mk
    trunk/package/mkdosfs/mkdosfs.mk
    trunk/package/mqueue-isdn/mqueue-isdn.mk
    trunk/package/netsnmp/netsnmp.mk
    trunk/package/ngrep/ngrep.mk
    trunk/package/nistnet/nistnet.mk
    trunk/package/openntpd/openntpd.mk
    trunk/package/openser/openser.mk
    trunk/package/openssl/openssl.mk
    trunk/package/pptpd/pptpd.mk
    trunk/package/quagga/quagga.mk
    trunk/package/rhino/rhino.mk
    trunk/package/rp-pppoe/rp-pppoe.mk
    trunk/package/sipp/sipp.mk
    trunk/package/sox/sox.mk
    trunk/package/sqlite/sqlite.mk
    trunk/package/tcl/tcl.mk
    trunk/package/tinyx/tinyx.mk
    trunk/package/vm-messenger/vm-messenger.mk
    trunk/package/wanpipe/wanpipe.mk
    trunk/package/xorg/xorg.mk
    trunk/package/zaptel/zaptel.mk
    trunk/package/zoneinfo/zoneinfo.mk

Modified: trunk/package/apcupsd/apcupsd.mk
===================================================================

--- trunk/package/apcupsd/apcupsd.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/apcupsd/apcupsd.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -43,7 +43,7 @@
 	$(MAKE1) -C $(APCUPSD_DIR) DESTDIR=$(STAGING_DIR) install
 	$(INSTALL) -D -m 0755 package/apcupsd/apcupsd.init $(TARGET_DIR)/etc/init.d/apcupsd
 	mkdir -p $(TARGET_DIR)/stat/etc/apcupsd
-	-rm $(STAGING_DIR)/etc/apcupsd/*.orig $(STAGING_DIR)/etc/apcupsd/*.new
+	rm -f $(STAGING_DIR)/etc/apcupsd/*.orig $(STAGING_DIR)/etc/apcupsd/*.new
 	# cp -a $(STAGING_DIR)/etc/apcupsd/* $(TARGET_DIR)/stat/etc/apcupsd/
 	$(INSTALL) -D -m 0755 package/apcupsd/apccontrol $(TARGET_DIR)/stat/etc/apcupsd/apccontrol
 	ln -sf /tmp/etc/apcupsd $(TARGET_DIR)/etc/apcupsd

Modified: trunk/package/app_bundle/app_bundle.mk
===================================================================
--- trunk/package/app_bundle/app_bundle.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/app_bundle/app_bundle.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -35,7 +35,6 @@
 
 app_bundle-dirclean:
 	rm -rf $(APPBUNDLE_DIR)
-	-rm $(BUILD_DIR)/app_bundle
 
 #############################################################
 #

Modified: trunk/package/asterisk/asterisk.mk
===================================================================
--- trunk/package/asterisk/asterisk.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/asterisk/asterisk.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -98,13 +98,23 @@
 ifneq ($(strip $(BR2_EXPERIMENTAL_ASTERISK)),)
 	set -x; \
 	for i in $(BR2_EXPERIMENTAL_ASTERISK); do \
-	  cp -a package/asterisk/$$i/. $(ASTERISK_DIR); \
-	  if [ -f $$i.patch ]; then \
+	  if [ -d package/asterisk/$$i ]; then \
+	    cp -a package/asterisk/$$i/. $(ASTERISK_DIR); \
+	  fi ; \
+	  if [ -f package/asterisk/$$i.patch ]; then \
 	    toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ $$i.patch; \
-	  fi \
+	  fi ; \
 	done
 endif
 
+	@# because it can't be turned off...
+	@i=`awk '/name="CORE-SOUNDS-EN-GSM"/ { print FNR, "\n"; exit 0; }' $(ASTERISK_DIR)/sounds/sounds.xml` ; \
+	if [ -n "$$i" ]; then \
+		i=$$(($$i+1)) ; \
+		$(SED) "$$i{/<defaultenabled>yes<\/defaultenabled>/d}" \
+			$(ASTERISK_DIR)/sounds/sounds.xml ; \
+	fi
+
 	touch $(ASTERISK_DIR)/.source
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source

Modified: trunk/package/bc/bc.mk
===================================================================
--- trunk/package/bc/bc.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/bc/bc.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -58,7 +58,7 @@
 
 bc-dirclean:
 	rm -rf $(BC_DIR)
-	-rm $(BUILD_DIR)/bc-$(BC_VER)
+	rm -f $(BUILD_DIR)/bc-$(BC_VER)
 
 #############################################################
 #

Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/busybox/busybox.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -138,7 +138,7 @@
 	install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
 endif
 	# Just in case
-	-rm $(TARGET_DIR)/linuxrc
+	rm -f $(TARGET_DIR)/linuxrc
 	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/addgroup
 	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/adduser
 	ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/delgroup
@@ -150,7 +150,7 @@
 		CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
 		ARCH=$(LINUX_KARCH) \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd install
-	-rm $(INITRD_DIR)/linuxrc
+	rm -f $(INITRD_DIR)/linuxrc
 	cp -a target/initrd/target_skeleton/linuxrc $(INITRD_DIR)/linuxrc
 
 busybox: uclibc $(TARGET_DIR)/bin/busybox

Modified: trunk/package/cvs/cvs.mk
===================================================================
--- trunk/package/cvs/cvs.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/cvs/cvs.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -35,8 +35,7 @@
 	$(MAKE) -C $(CVS_DIR)
 
 $(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY)
-	install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
-	$(STRIP) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
+	$(INSTALL) -D -s $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY)
 
 cvs: uclibc ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY)
 

Modified: trunk/package/dialog/dialog.mk
===================================================================
--- trunk/package/dialog/dialog.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/dialog/dialog.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -42,7 +42,7 @@
 dialog-source: $(DL_DIR)/$(DIALOG_SOURCE)
 
 dialog-clean:
-	-rm $(TARGET_DIR)/$(DIALOG_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/$(DIALOG_TARGET_BINARY)
 	-$(MAKE) -C $(DIALOG_DIR) clean
 
 dialog-dirclean:

Modified: trunk/package/digiumg729/digiumg729.mk
===================================================================
--- trunk/package/digiumg729/digiumg729.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/digiumg729/digiumg729.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -13,8 +13,8 @@
 digiumg729: uclibc linux asterisk $(DIGIUMG729_TARGET_BINARY)
 
 digiumg729-clean:
-	-rm $(DIGIUMG729_TARGET_BINARY)
-	-rm $(TARGET_DIR)/usr/sbin/g729register
+	rm -f $(DIGIUMG729_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/usr/sbin/g729register
 
 digiumg729-dirclean:
 	echo "Nothing to do"

Modified: trunk/package/dropbear/dropbear.mk
===================================================================
--- trunk/package/dropbear/dropbear.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/dropbear/dropbear.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -62,9 +62,8 @@
 	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	install -d -m 755 $(TARGET_DIR)/usr/sbin
 	install -d -m 755 $(TARGET_DIR)/usr/bin
-	install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
+	install -m 755 -s $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
 		$(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
-	$(STRIP) $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
 	ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp
 	ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh
 	ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient

Modified: trunk/package/ebtables/ebtables.mk
===================================================================
--- trunk/package/ebtables/ebtables.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/ebtables/ebtables.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -42,10 +42,10 @@
 
 ebtables-clean:
 	-$(MAKE) -C $(EBTABLES_BUILD_DIR) KERNEL_DIR=$(LINUX_DIR) clean
-	-rm -rf $(STAGING_DIR)/usr/sbin/ebtables
-	-rm -rf $(TARGET_DIR)/usr/sbin/ebtables
-	-rm -rf $(STAGING_DIR)/usr/sbin/ip6tables
-	-rm -rf $(TARGET_DIR)/usr/sbin/ip6tables
+	rm -rf $(STAGING_DIR)/usr/sbin/ebtables
+	rm -rf $(TARGET_DIR)/usr/sbin/ebtables
+	rm -rf $(STAGING_DIR)/usr/sbin/ip6tables
+	rm -rf $(TARGET_DIR)/usr/sbin/ip6tables
 	rm -rf $(TARGET_DIR)/etc/init.d/ebtables
 
 ebtables-dirclean:

Modified: trunk/package/ethtool/ethtool.mk
===================================================================
--- trunk/package/ethtool/ethtool.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/ethtool/ethtool.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -44,7 +44,7 @@
 
 ethtool-clean:
 	$(MAKE) -C $(ETHTOOL_DIR) clean
-	-rm $(TARGET_DIR)/usr/sbin/ethtool
+	rm -f $(TARGET_DIR)/usr/sbin/ethtool
 
 ethtool-dirclean:
 	rm -rf $(ETHTOOL_DIR)

Modified: trunk/package/flex/flex.mk
===================================================================
--- trunk/package/flex/flex.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/flex/flex.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -87,7 +87,7 @@
 		-C $(FLEX_DIR) uninstall
 	rm -f $(TARGET_DIR)/usr/bin/flex
 ifeq ($(strip $(BR2_PACKAGE_FLEX_LIBFL)),y)
-	-rm $(STAGING_DIR)/lib/libfl.a
+	rm -f $(STAGING_DIR)/lib/libfl.a
 endif
 	-$(MAKE) -C $(FLEX_DIR) clean
 

Modified: trunk/package/hostap/hostap.mk
===================================================================
--- trunk/package/hostap/hostap.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/hostap/hostap.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -29,8 +29,8 @@
 
 $(TARGET_DIR)//usr/bin/hostap_crypt_conf: $(HOSTAP_DIR)/utils/hostap_crypt_conf
 	# Make the dir
-	-rm -rf $(HOSTAP_TARGET_MODULE_DIR)
-	-mkdir -p $(HOSTAP_TARGET_MODULE_DIR)
+	rm -rf $(HOSTAP_TARGET_MODULE_DIR)
+	mkdir -p $(HOSTAP_TARGET_MODULE_DIR)
 	# Copy the pcmcia-cs conf file
 	-mkdir -p $(TARGET_DIR)/etc/pcmcia
 	cp -af $(HOSTAP_DIR)/driver/etc/hostap_cs.conf $(TARGET_DIR)/etc/pcmcia/

Modified: trunk/package/ipsec-tools/ipsec-tools.mk
===================================================================
--- trunk/package/ipsec-tools/ipsec-tools.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/ipsec-tools/ipsec-tools.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -92,7 +92,7 @@
 	  $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
 	  $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
 	  $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
-	-rm -f $(TARGET_DIR)/usr/man/man3/ipsec_strerror.3 \
+	rm -f $(TARGET_DIR)/usr/man/man3/ipsec_strerror.3 \
 	  $(TARGET_DIR)/usr/man/man3/ipsec_set_policy.3 \
 	  $(TARGET_DIR)/usr/man/man5/racoon.conf.5 \
 	  $(TARGET_DIR)/usr/man/man8/racoonctl.8 \
@@ -108,7 +108,7 @@
 	  $(STAGING_DIR)/lib
 endif
 ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y)
-	-rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+	rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
 endif
 
 IPSEC_TOOLS_PROGS= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
@@ -126,15 +126,15 @@
 
 ipsec-tools-clean:
 	$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
-	-rm $(TARGET_DIR)/etc/init.d/ipsec
+	rm -f $(TARGET_DIR)/etc/init.d/ipsec
 	$(MAKE) -C $(IPSEC_TOOLS_DIR) clean
 ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_LIBS)), y)
-	-rm -f $(STAGING_DIR)/lib/libipsec.a
-	-rm -f $(STAGING_DIR)/lib/libipsec.la
-	-rm -f $(STAGING_DIR)/lib/libracoon.a
-	-rm -f $(STAGING_DIR)/lib/libracoon.la
+	rm -f $(STAGING_DIR)/lib/libipsec.a
+	rm -f $(STAGING_DIR)/lib/libipsec.la
+	rm -f $(STAGING_DIR)/lib/libracoon.a
+	rm -f $(STAGING_DIR)/lib/libracoon.la
 endif
-	-rm $(IPSEC_TOOLS_DIR)/.configured
+	rm $(IPSEC_TOOLS_DIR)/.configured
 
 ipsec-tools-dirclean:
 	@echo $(LINUX_DIR)

Modified: trunk/package/libftdi/libftdi.mk
===================================================================
--- trunk/package/libftdi/libftdi.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/libftdi/libftdi.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -45,7 +45,7 @@
 libftdi: uclibc libusb $(TARGET_DIR)/$(LIBFTDI_TARGET_BINARY)
 
 libftdi-clean:
-	-rm -f $(TARGET_DIR)/usr/lib/libftdi.so*
+	rm -f $(TARGET_DIR)/usr/lib/libftdi.so*
 	-$(MAKE) -C $(LIBFTDI_DIR) clean
 
 libftdi-dirclean:

Modified: trunk/package/libpri/libpri.mk
===================================================================
--- trunk/package/libpri/libpri.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/libpri/libpri.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -29,8 +29,8 @@
 	INSTALL_BASE=/usr INSTALL_PREFIX=$(STAGING_DIR) install
 	$(MAKE) -C $(LIBPRI_DIR) OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) $(TARGET_CONFIGURE_OPTS) \
 	INSTALL_BASE=/usr INSTALL_PREFIX=$(TARGET_DIR) install
-	-rm -rf $(TARGET_DIR)/usr/include
-	-rm -f $(TARGET_DIR)/usr/lib/*.a
+	rm -rf $(TARGET_DIR)/usr/include
+	rm -f $(TARGET_DIR)/usr/lib/*.a
 	-$(STRIP) -g $(TARGET_DIR)/usr/lib/libpri*
 	touch -c $(TARGET_DIR)/$(LIBPRI_TARGET_BINARY)
 

Modified: trunk/package/linux-atm/linux-atm.mk
===================================================================
--- trunk/package/linux-atm/linux-atm.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/linux-atm/linux-atm.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -74,9 +74,9 @@
 
 linux-atm-clean:
 	$(MAKE) -C $(LINUX-ATM_DIR) clean
-	-rm $(BUILD_DIR)/atm2684/atm2684/br2684ctl/br2684ctl
-	-rm $(TARGET_DIR)/usr/sbin/br2684ctl
-	-rm $(TARGET_DIR)/usr/sbin/atmsigd
+	rm -f $(BUILD_DIR)/atm2684/atm2684/br2684ctl/br2684ctl
+	rm -f $(TARGET_DIR)/usr/sbin/br2684ctl
+	rm -f $(TARGET_DIR)/usr/sbin/atmsigd
 
 linux-atm-dirclean:
 	rm -rf $(LINUX-ATM_DIR)

Modified: trunk/package/mkdosfs/mkdosfs.mk
===================================================================
--- trunk/package/mkdosfs/mkdosfs.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/mkdosfs/mkdosfs.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -38,7 +38,7 @@
 
 mkdosfs-clean:
 	# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKDOSFS_DIR) uninstall
-	-rm $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
 	-$(MAKE) -C $(MKDOSFS_DIR) clean
 
 mkdosfs-dirclean:

Modified: trunk/package/mqueue-isdn/mqueue-isdn.mk
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/mqueue-isdn/mqueue-isdn.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -90,7 +90,7 @@
 
 mqueue_misdn-dirclean:
 	rm -rf $(MQUEUEISDN_DIR)
-	-rm $(BUILD_DIR)/mqueue-isdn
+	rm -f $(BUILD_DIR)/mqueue-isdn
 
 #############################################################
 #

Modified: trunk/package/netsnmp/netsnmp.mk
===================================================================
--- trunk/package/netsnmp/netsnmp.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/netsnmp/netsnmp.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -85,10 +85,10 @@
 	    includedir=$(STAGING_DIR)/include/net-snmp \
 	    ucdincludedir=$(STAGING_DIR)/include/ucd-snmp \
 	    -C $(NETSNMP_DIR) install;
-	-rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	# Remove default config stuff
-	-rm -rf $(TARGET_DIR)/etc/snmp
+	rm -rf $(TARGET_DIR)/etc/snmp
 	# symlink because that is what we like to do
 	ln -s /tmp/etc/snmp $(TARGET_DIR)/etc/snmp
 	$(INSTALL) -D -m 0755 package/netsnmp/netsnmp.init $(TARGET_DIR)/etc/init.d/snmpd
@@ -103,7 +103,7 @@
 	# Copy libs to staging dir
 	cp -a $(TARGET_DIR)/usr/lib/libnetsnmp* $(STAGING_DIR)/usr/lib/
 	chmod +x $(STAGING_DIR)/usr/bin/net-snmp-config
-	-rm $(TARGET_DIR)/usr/lib/*.a $(TARGET_DIR)/usr/lib/*.la
+	rm -f $(TARGET_DIR)/usr/lib/*.a $(TARGET_DIR)/usr/lib/*.la
 	-$(STRIP) $(TARGET_DIR)/usr/lib/libnetsnmp*.so
 	-$(STRIP) $(TARGET_DIR)/usr/sbin/snmpd
 	-$(STRIP) $(TARGET_DIR)/usr/bin/snmp*

Modified: trunk/package/ngrep/ngrep.mk
===================================================================
--- trunk/package/ngrep/ngrep.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/ngrep/ngrep.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -38,8 +38,7 @@
 	touch -c $(NGREP_DIR)/$(NGREP_BINARY)
 
 $(TARGET_DIR)/$(NGREP_TARGET_BINARY): $(NGREP_DIR)/$(NGREP_BINARY)
-	$(INSTALL) -D -m 0755 $(NGREP_DIR)/$(NGREP_BINARY) $(TARGET_DIR)/$(NGREP_TARGET_BINARY)
-	$(STRIP) $(TARGET_DIR)/$(NGREP_TARGET_BINARY)
+	$(INSTALL) -D -m 0755 -s $(NGREP_DIR)/$(NGREP_BINARY) $(TARGET_DIR)/$(NGREP_TARGET_BINARY)
 	touch -c $(TARGET_DIR)/$(NGREP_TARGET_BINARY)
 
 ngrep: uclibc libpcap $(TARGET_DIR)/$(NGREP_TARGET_BINARY)

Modified: trunk/package/nistnet/nistnet.mk
===================================================================
--- trunk/package/nistnet/nistnet.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/nistnet/nistnet.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -47,14 +47,14 @@
 nistnet-source: $(DL_DIR)/$(NISTNET_SOURCE)
 
 nistnet-clean:
-	-rm $(TARGET_DIR)/usr/sbin/cnistnet
-	-rm $(TARGET_DIR)/usr/sbin/hitbox
-	-rm $(TARGET_DIR)/usr/sbin/mungebox
-	-rm $(TARGET_DIR)/usr/sbin/nistspy
-	-rm $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
-	-rm $(TARGET_DIR)/etc/init.d/nistnet
+	rm -f $(TARGET_DIR)/usr/sbin/cnistnet
+	rm -f $(TARGET_DIR)/usr/sbin/hitbox
+	rm -f $(TARGET_DIR)/usr/sbin/mungebox
+	rm -f $(TARGET_DIR)/usr/sbin/nistspy
+	rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/nistnet.ko
+	rm -f $(TARGET_DIR)/etc/init.d/nistnet
 	/sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
-	-rm $(TARGET_DIR)/stat/var/www/admin/nistnet.php
+	rm -f $(TARGET_DIR)/stat/var/www/admin/nistnet.php
 	-$(MAKE) -C $(NISTNET_DIR) clean
 
 nistnet-dirclean:

Modified: trunk/package/openntpd/openntpd.mk
===================================================================
--- trunk/package/openntpd/openntpd.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/openntpd/openntpd.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -37,7 +37,7 @@
 	touch -c $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
 
 $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
-	-rm $(TARGET_DIR)/etc/ntpd.conf
+	rm -f $(TARGET_DIR)/etc/ntpd.conf
 	$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
 	-$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
 	$(INSTALL) -D -m 0755 package/openntpd/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd

Modified: trunk/package/openser/openser.mk
===================================================================
--- trunk/package/openser/openser.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/openser/openser.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -96,25 +96,25 @@
 rtpproxy-source: $(DL_DIR)/$(RTPPROXY_SOURCE)
 
 rtpproxy-clean:
-	-rm $(TARGET_DIR)/usr/sbin/rtpproxy
+	rm $(TARGET_DIR)/usr/sbin/rtpproxy
 	-$(MAKE) -C $(RTPPROXY_DIR) clean
 
 rtpproxy-dirclean:
-	-rm -rf $(RTPPROXY_DIR)
+	rm -rf $(RTPPROXY_DIR)
 
 openser: uclibc bash openssl $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
 
 openser-source: $(DL_DIR)/$(OPENSER_SOURCE)
 
 openser-clean:
-	-rm -rf $(TARGET_DIR)/etc/init.d/openser
-	-rm -rf $(TARGET_DIR)/usr/sbin/openserctl
-	-rm -rf $(TARGET_DIR)/usr/lib/openser
-	-rm -rf $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
+	rm -rf $(TARGET_DIR)/etc/init.d/openser
+	rm -rf $(TARGET_DIR)/usr/sbin/openserctl
+	rm -rf $(TARGET_DIR)/usr/lib/openser
+	rm -rf $(TARGET_DIR)/$(OPENSER_TARGET_BINARY)
 	-$(MAKE) -C $(OPENSER_DIR) clean
 
 openser-dirclean:
-	-rm -rf $(OPENSER_DIR)
+	rm -rf $(OPENSER_DIR)
 
 #############################################################
 #

Modified: trunk/package/openssl/openssl.mk
===================================================================
--- trunk/package/openssl/openssl.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/openssl/openssl.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -60,7 +60,7 @@
 	$(SED) 's,mcpu,mtune,g' -i $(OPENSSL_DIR)/Makefile
 	$(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) all build-shared
 	# Work around openssl build bug to link libssl.so with libcrypto.so.
-	-rm $(OPENSSL_DIR)/libssl.so.*.*.*
+	rm -f $(OPENSSL_DIR)/libssl.so.*.*.*
 	$(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) do_linux-shared
 	$(INSTALL) -D -m 0755 $(OPENSSL_DIR)/apps/openssl $(TARGET_DIR)/usr/bin/openssl
 

Modified: trunk/package/pptpd/pptpd.mk
===================================================================
--- trunk/package/pptpd/pptpd.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/pptpd/pptpd.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -49,10 +49,10 @@
 pptpd: uclibc $(TARGET_DIR)/$(PPTPD_TARGET_BINARY)
 
 pptpd-clean:
-	-rm $(TARGET_DIR)/etc/pptpd.conf
-	-rm (TARGET_DIR)/usr/sbin/bcrelay
-	-rm $(TARGET_DIR)/usr/sbin/pptpctrl
-	-rm $(TARGET_DIR)/$(PPTPD_TARGET_BINARY)
+	rm -f $(TARGET_DIR)/etc/pptpd.conf
+	rm -f $(TARGET_DIR)/usr/sbin/bcrelay
+	rm -f $(TARGET_DIR)/usr/sbin/pptpctrl
+	rm -f $(TARGET_DIR)/$(PPTPD_TARGET_BINARY)
 	-$(MAKE) -C $(PPTPD_DIR) clean
 
 pptpd-dirclean:

Modified: trunk/package/quagga/quagga.mk
===================================================================
--- trunk/package/quagga/quagga.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/quagga/quagga.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -77,9 +77,9 @@
 
 quagga-clean: 
 	-$(MAKE) -C $(QUAGGA_DIR) clean
-	-rm -f $(TARGET_DIR)/usr/sbin/zebra
-	-rm -f $(TARGET_DIR)/usr/lib/libospf*
-	-rm -f $(TARGET_DIR)/usr/lib/libzebra*
+	rm -f $(TARGET_DIR)/usr/sbin/zebra
+	rm -f $(TARGET_DIR)/usr/lib/libospf*
+	rm -f $(TARGET_DIR)/usr/lib/libzebra*
 
 quagga-dirclean: 
 	rm -rf $(QUAGGA_DIR)

Modified: trunk/package/rhino/rhino.mk
===================================================================
--- trunk/package/rhino/rhino.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/rhino/rhino.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -55,10 +55,10 @@
 
 rhino-clean:
 	-$(MAKE1) -C $(RHINO_DIR) INSTALLPREFIX=$(TARGET_DIR) clean
-	-rm $(RHINO_DIR)/.built
+	rm -f $(RHINO_DIR)/.built
 
 rhino-dirclean:
-	-rm -rf $(RHINO_DIR)
+	rm -rf $(RHINO_DIR)
 
 #############################################################
 #

Modified: trunk/package/rp-pppoe/rp-pppoe.mk
===================================================================
--- trunk/package/rp-pppoe/rp-pppoe.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/rp-pppoe/rp-pppoe.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -72,12 +72,12 @@
 
 rp-pppoe-clean:
 	-$(MAKE) -C $(RP-PPPOE_BUILD_DIR) clean
-	-rm $(TARGET_DIR)/usr/sbin/pppoe-*
-	-rm $(TARGET_DIR)/usr/sbin/pppoe
-	-rm $(TARGET_DIR)/usr/lib/ppp/rp-pppoe.so
+	rm $(TARGET_DIR)/usr/sbin/pppoe-*
+	rm $(TARGET_DIR)/usr/sbin/pppoe
+	rm $(TARGET_DIR)/usr/lib/ppp/rp-pppoe.so
 
 rp-pppoe-dirclean:
-	-rm -rf $(RP-PPPOE_BUILD_DIR)
+	rm -rf $(RP-PPPOE_BUILD_DIR)
 #############################################################
 #
 # Toplevel Makefile options

Modified: trunk/package/sipp/sipp.mk
===================================================================
--- trunk/package/sipp/sipp.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/sipp/sipp.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -39,7 +39,7 @@
 
 sipp-clean:
 	$(MAKE) -C $(SIPP_DIR) clean
-	-rm $(TARGET_DIR)/usr/sbin/sipp
+	rm -f $(TARGET_DIR)/usr/sbin/sipp
 
 sipp-dirclean:
 	rm -rf $(SIPP_DIR)

Modified: trunk/package/sox/sox.mk
===================================================================
--- trunk/package/sox/sox.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/sox/sox.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -49,16 +49,14 @@
 	$(MAKE) CC=$(TARGET_CC) -C $(SOX_DIR)
 
 $(TARGET_DIR)/usr/bin/sox: $(SOX_DIR)/src/sox
-	install -m 0755 -c $(SOX_DIR)/src/sox $(TARGET_DIR)/usr/bin/sox
-	install -m 0755 -c $(SOX_DIR)/src/soxmix $(TARGET_DIR)/usr/bin/soxmix
-	$(STRIP) $(TARGET_DIR)/usr/bin/sox > /dev/null 2>&1
-	$(STRIP) $(TARGET_DIR)/usr/bin/soxmix > /dev/null 2>&1
+	$(INSTALL) -m 0755 -c -D -s $(SOX_DIR)/src/sox $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 0755 -c -D -s $(SOX_DIR)/src/soxmix $(TARGET_DIR)/usr/bin
 
 sox: uclibc $(SOX_MP3) $(TARGET_DIR)/usr/bin/sox
 
 sox-clean:
-	rm $(TARGET_DIR)/usr/bin/sox
-	rm $(TARGET_DIR)/usr/bin/soxmix
+	rm -f $(TARGET_DIR)/usr/bin/sox
+	rm -f $(TARGET_DIR)/usr/bin/soxmix
 	$(MAKE) -C $(SOX_DIR) clean
 
 sox-dirclean: 

Modified: trunk/package/sqlite/sqlite.mk
===================================================================
--- trunk/package/sqlite/sqlite.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/sqlite/sqlite.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -75,12 +75,12 @@
 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
 
 sqlite-clean:
-	-rm -rf $(TARGET_DIR)/usr/lib/libsqlite3.so.*
-	-rm -rf $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
+	rm -rf $(TARGET_DIR)/usr/lib/libsqlite3.so.*
+	rm -rf $(TARGET_DIR)/$(SQLITE_TARGET_BINARY)
 	-$(MAKE) -C $(SQLITE_DIR) clean
 
 sqlite-dirclean:
-	-rm -rf $(SQLITE_DIR)
+	rm -rf $(SQLITE_DIR)
 
 #############################################################
 #

Modified: trunk/package/tcl/tcl.mk
===================================================================
--- trunk/package/tcl/tcl.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/tcl/tcl.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -40,12 +40,12 @@
 	$(MAKE) INSTALL_ROOT=$(TARGET_DIR) -C $(TCL_DIR)/unix install
 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libtcl8.4.so
 	rm -Rf $(TARGET_DIR)/usr/man
-	-if [ "$(strip $(BR2_PACKAGE_TCL_DEL_ENCODINGS))" == "y" ]; then \
-	rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
-	fi
-	-if [ "$(strip $(BR2_PACKAGE_TCL_SHLIB_ONLY))" == "y" ]; then \
-	rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
-	fi
+ifeq ($(strip $(BR2_PACKAGE_TCL_DEL_ENCODINGS)),y)
+	rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*
+endif
+ifeq ($(strip $(BR2_PACKAGE_TCL_SHLIB_ONLY)),y)
+	rm -f $(TARGET_DIR)/usr/bin/tclsh8.4
+endif
 
 tcl: uclibc $(TARGET_DIR)/usr/lib/libtcl8.4.so
 

Modified: trunk/package/tinyx/tinyx.mk
===================================================================
--- trunk/package/tinyx/tinyx.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/tinyx/tinyx.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -140,12 +140,12 @@
 tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)
 
 tinyx-clean:
-	-rm -rf $(TARGET_DIR)/usr/X11R6
+	rm -rf $(TARGET_DIR)/usr/X11R6
 	-$(MAKE) -C $(TINYX_DIR) clean
 
 tinyx-dirclean:
-	-rm -rf $(TINYX_DIR)
-	-rm -rf $(TARGET_DIR)/usr/X11R6
+	rm -rf $(TINYX_DIR)
+	rm -rf $(TARGET_DIR)/usr/X11R6
 #############################################################
 #
 # Toplevel Makefile options

Modified: trunk/package/vm-messenger/vm-messenger.mk
===================================================================
--- trunk/package/vm-messenger/vm-messenger.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/vm-messenger/vm-messenger.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -22,10 +22,10 @@
 	chmod -R 755 $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
 
 vm-messenger-clean:
-	-rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+	rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
 
 vm-messenger-dirclean:
-	-rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
+	rm -rf $(TARGET_DIR)/$(VM-MESSENGER_TARGET_DIR)
 
 vm-messenger: uclibc asterisk minihttpd
  

Modified: trunk/package/wanpipe/wanpipe.mk
===================================================================
--- trunk/package/wanpipe/wanpipe.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/wanpipe/wanpipe.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -38,11 +38,9 @@
 	ZAPDIR=$(ZAPTEL_DIR) PWD=$(WANPIPE_DIR) $(TARGET_CONFIGURE_OPTS) INSTALLPREFIX=$(TARGET_DIR) \
 	KMOD=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) -C $(WANPIPE_DIR) ARCH=$(ZAPTEL_TARGET_ARCH) install
 	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION)
-	$(INSTALL) -D -m 0755 $(WANPIPE_DIR)/util/wan_aftup/wan_aftup $(TARGET_DIR)/usr/sbin/wan_aftup
-	$(STRIP) $(TARGET_DIR)/usr/sbin/wan_aftup
-	-mv $(TARGET_DIR)/etc/wanpipe $(TARGET_DIR)/stat/etc/
+	$(INSTALL) -D -m 0755 -s $(WANPIPE_DIR)/util/wan_aftup/wan_aftup $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
+	mv $(TARGET_DIR)/etc/wanpipe $(TARGET_DIR)/stat/etc/
 	ln -sf /tmp/etc/wanpipe $(TARGET_DIR)/etc/wanpipe
-	touch $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
 
 wanpipe: uclibc linux zaptel-unpack flex $(TARGET_DIR)/$(WANPIPE_TARGET_BINARY)
 

Modified: trunk/package/xorg/xorg.mk
===================================================================
--- trunk/package/xorg/xorg.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/xorg/xorg.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -105,12 +105,12 @@
 xorg-source: $(DL_DIR)/$(XORG_SOURCE)
 
 xorg-clean:
-	-rm -rf $(TARGET_DIR)/usr/X11R6
+	rm -rf $(TARGET_DIR)/usr/X11R6
 	-$(MAKE) -C $(XORG_DIR) clean
 
 xorg-dirclean:
-	-rm -rf $(XORG_DIR)
-	-rm -rf $(TARGET_DIR)/usr/X11R6
+	rm -rf $(XORG_DIR)
+	rm -rf $(TARGET_DIR)/usr/X11R6
 
 #############################################################
 #

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/zaptel/zaptel.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -61,9 +61,9 @@
 	$(MAKE1) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
 	DESTDIR=$(TARGET_DIR) KVERS=$(LINUX_VERSION) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
 	install-programs install-libs install-modules
-	-rm -rf $(TARGET_DIR)/usr/include
-	-rm -f $(TARGET_DIR)/usr/lib/*.a
-	-rm -rf $(TARGET_DIR)/$(PERLLIBDIR)
+	rm -rf $(TARGET_DIR)/usr/include
+	rm -f $(TARGET_DIR)/usr/lib/*.a
+	rm -rf $(TARGET_DIR)/$(PERLLIBDIR)
 	-$(STRIP) $(TARGET_DIR)/sbin/zt* $(TARGET_DIR)/usr/lib/libtone*
 	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION)
 	$(INSTALL) -D -m 755 package/zaptel/zaptel.init $(TARGET_DIR)/etc/init.d/zaptel

Modified: trunk/package/zoneinfo/zoneinfo.mk
===================================================================
--- trunk/package/zoneinfo/zoneinfo.mk	2008-03-01 04:45:13 UTC (rev 1611)
+++ trunk/package/zoneinfo/zoneinfo.mk	2008-03-02 22:31:23 UTC (rev 1612)
@@ -33,10 +33,10 @@
 zoneinfo-source: $(DL_DIR)/$(ZONEINFO_SOURCE) $(DL_DIR)/$(ZONEINFO_DATA)
 
 zoneinfo-clean:
-	-rm -rf $(TARGET_DIR)/usr/share/zoneinfo
+	rm -rf $(TARGET_DIR)/usr/share/zoneinfo
 
 zoneinfo-dirclean:
-	-rm -rf $(ZONEINFO_DIR)
+	rm -rf $(ZONEINFO_DIR)
 
 #############################################################
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


