From 75344975c4d6687ba1615aaa298fae0a369cebbd Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 5 Aug 2008 22:02:15 +0000 Subject: [PATCH] Makefile cleanups, round 4 SVN-Revision: 12173 --- utils/alsa-utils/Makefile | 3 --- utils/bash/Makefile | 3 --- utils/cmdpad/Makefile | 3 --- utils/digitemp/Makefile | 3 --- utils/dosfstools/Makefile | 3 --- utils/firmwarehotplug/Makefile | 3 --- utils/gadgetfs-test/Makefile | 1 - utils/gnokii/Makefile | 3 --- utils/lirc/Makefile | 3 --- utils/logrotate/Makefile | 3 --- utils/lrzsz/Makefile | 3 --- utils/macchanger/Makefile | 3 --- utils/rrdcollect/Makefile | 3 --- utils/screen/Makefile | 3 --- utils/unzip/Makefile | 2 -- utils/usbutils/Makefile | 3 --- utils/valgrind/Makefile | 3 --- utils/wx200d/Makefile | 3 --- utils/zip/Makefile | 2 -- 19 files changed, 53 deletions(-) diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile index c086879d7e..9dcfde79da 100644 --- a/utils/alsa-utils/Makefile +++ b/utils/alsa-utils/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ PKG_MD5SUM:=dfe4bb5d3217f3ec662b172ce8397cf0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/alsa-utils diff --git a/utils/bash/Makefile b/utils/bash/Makefile index 1d753991ac..7fa750b991 100644 --- a/utils/bash/Makefile +++ b/utils/bash/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/bash/ PKG_MD5SUM:=00bfa16d58e034e3c2aa27f390390d30 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/bash diff --git a/utils/cmdpad/Makefile b/utils/cmdpad/Makefile index b6ba760de0..70239c5650 100644 --- a/utils/cmdpad/Makefile +++ b/utils/cmdpad/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/cmdpad/ PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/cmdpad diff --git a/utils/digitemp/Makefile b/utils/digitemp/Makefile index 8b7f907142..ccb297728a 100644 --- a/utils/digitemp/Makefile +++ b/utils/digitemp/Makefile @@ -9,9 +9,6 @@ PKG_SOURCE_URL:=http://www.digitemp.com/software/linux PKG_MD5SUM:=72bda9c8a66b017aa969c19dedb3225b PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/digitemp diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index c674aca23c..ef61297eba 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/ PKG_MD5SUM:=407d405ade410f7597d364ab5dc8c9f6 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/dosfstools diff --git a/utils/firmwarehotplug/Makefile b/utils/firmwarehotplug/Makefile index 372839206d..6b41246bbe 100644 --- a/utils/firmwarehotplug/Makefile +++ b/utils/firmwarehotplug/Makefile @@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-hotplug PKG_MD5SUM:=e5cf352b172f498e27b160167b981f24 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk # workaround for fedora sdcc naming changes diff --git a/utils/gadgetfs-test/Makefile b/utils/gadgetfs-test/Makefile index df7610ea90..814b123f52 100644 --- a/utils/gadgetfs-test/Makefile +++ b/utils/gadgetfs-test/Makefile @@ -17,7 +17,6 @@ PKG_SOURCE_URL:=http://avr32linux.org/twiki/pub/Main/GadgetFsTest PKG_MD5SUM:=49476a74c29f1281c8a4c035aa57a5bd PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/utils/gnokii/Makefile b/utils/gnokii/Makefile index 0bca863e41..11c131cf21 100644 --- a/utils/gnokii/Makefile +++ b/utils/gnokii/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://gnokii.org/download/gnokii/0.6.x PKG_MD5SUM:=bbf0aabe2436d8e927f3e2edb4efcac8 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/gnokii diff --git a/utils/lirc/Makefile b/utils/lirc/Makefile index 8fd36897d9..94794cc329 100644 --- a/utils/lirc/Makefile +++ b/utils/lirc/Makefile @@ -18,9 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/${PKG_NAME} PKG_MD5SUM:=8e78eeded7b31e5ad02e328970437c0f -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/lirc/Default diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile index 00366902a7..8567499cde 100644 --- a/utils/logrotate/Makefile +++ b/utils/logrotate/Makefile @@ -20,9 +20,6 @@ PKG_SOURCE_URL:= \ http://ftp.us.debian.org/debian/pool/main/l/logrotate PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/logrotate diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 9c8675f13a..ad78af60d1 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ohse.de/uwe/releases/ PKG_MD5SUM:=b5ce6a74abc9b9eb2af94dffdfd372a4 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/lrzsz diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile index 92edc1bee6..580ff6134b 100644 --- a/utils/macchanger/Makefile +++ b/utils/macchanger/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/macchanger PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/macchanger diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index bf01704f44..e21341839c 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/rrdcollect PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/rrdcollect/Default diff --git a/utils/screen/Makefile b/utils/screen/Makefile index 2278d5daf1..155a0a2252 100644 --- a/utils/screen/Makefile +++ b/utils/screen/Makefile @@ -17,9 +17,6 @@ PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/utilities/screen \ @GNU/screen PKG_MD5SUM:=8506fd205028a96c741e4037de6e3c42 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/screen diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile index ed338dcc05..93a74e90b1 100644 --- a/utils/unzip/Makefile +++ b/utils/unzip/Makefile @@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)552.zip PKG_SOURCE_URL:=@SF/infozip PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) include $(INCLUDE_DIR)/package.mk diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile index 098f32bd60..e9ab55df3e 100644 --- a/utils/usbutils/Makefile +++ b/utils/usbutils/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-usb PKG_MD5SUM:=88978b4ad891f610620b1b8e5e0f43eb -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - PKG_BUILD_DEPENDS:=zlib include $(INCLUDE_DIR)/package.mk diff --git a/utils/valgrind/Makefile b/utils/valgrind/Makefile index b52983ce1d..ccf48f2c67 100644 --- a/utils/valgrind/Makefile +++ b/utils/valgrind/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://valgrind.org/downloads/ PKG_MD5SUM:=978847992b136c8d8cb5c6559a91df1c -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/valgrind diff --git a/utils/wx200d/Makefile b/utils/wx200d/Makefile index 7ab6592a8b..f4a229a1b6 100644 --- a/utils/wx200d/Makefile +++ b/utils/wx200d/Makefile @@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/wx200d PKG_MD5SUM:=0f90c099dddcdd46ac568d707822ec4c -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/wx200d diff --git a/utils/zip/Makefile b/utils/zip/Makefile index 8b4521e0c9..fe3fb0cbb5 100644 --- a/utils/zip/Makefile +++ b/utils/zip/Makefile @@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)232.zip PKG_SOURCE_URL:=@SF/infozip PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE) include $(INCLUDE_DIR)/package.mk -- 2.30.2