diff options
Diffstat (limited to 'openwrt/package')
23 files changed, 135 insertions, 146 deletions
diff --git a/openwrt/package/chillispot/Makefile b/openwrt/package/chillispot/Makefile index cacaee2553..81937aab79 100644 --- a/openwrt/package/chillispot/Makefile +++ b/openwrt/package/chillispot/Makefile @@ -50,14 +50,14 @@ $(PKG_BUILD_DIR)/.configured: ); touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_CHILLISPOT): install -m0755 -d $(IDIR_CHILLISPOT)/etc/init.d diff --git a/openwrt/package/cyrus-sasl/Makefile b/openwrt/package/cyrus-sasl/Makefile index b759ec10dc..2729883102 100644 --- a/openwrt/package/cyrus-sasl/Makefile +++ b/openwrt/package/cyrus-sasl/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=2.1.20 PKG_RELEASE:=1 PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977 -PKG_SOURCE_URL:= \ - http://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat @@ -85,20 +83,20 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --without-dmalloc \ --without-sfio \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/include \ CC="$(HOSTCC)" \ LINK="$(HOSTCC) -o makemd5 -lc" \ CFLAGS="" \ makemd5 - $(MAKE) -C $(PKG_BUILD_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBSASL2): install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/ diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile index 7da1928982..f92107c7f0 100644 --- a/openwrt/package/dhcp-forwarder/Makefile +++ b/openwrt/package/dhcp-forwarder/Makefile @@ -2,16 +2,16 @@ include $(TOPDIR)/rules.mk -PKG_NAME := dhcp-forwarder -PKG_VERSION := 0.7 -PKG_RELEASE := 4 -PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2 +PKG_NAME:=dhcp-forwarder +PKG_VERSION:=0.7 +PKG_RELEASE:=4 +PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2 -PKG_SOURCE_URL := http://savannah.nongnu.org/download/dhcp-fwd -PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_CAT := bzcat +PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_CAT:=bzcat -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk @@ -47,13 +47,13 @@ $(PKG_BUILD_DIR)/.configured: touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - cfg_filename="/etc/dhcp-fwd.conf" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + cfg_filename="/etc/dhcp-fwd.conf" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_DHCP_FORWARDER): install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc diff --git a/openwrt/package/freeradius/Makefile b/openwrt/package/freeradius/Makefile index 54b0403a31..6da13253d7 100644 --- a/openwrt/package/freeradius/Makefile +++ b/openwrt/package/freeradius/Makefile @@ -131,16 +131,16 @@ $(PKG_BUILD_DIR)/.configured: --without-rlm_unix \ --without-rlm_x99-token \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ R="$(PKG_INSTALL_DIR)" \ INSTALLSTRIP="" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_FREERADIUS): install -m0755 -d $(IDIR_FREERADIUS)/etc/init.d diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile index 4e228b3f16..9ddd2ab754 100644 --- a/openwrt/package/fuse/Makefile +++ b/openwrt/package/fuse/Makefile @@ -59,15 +59,15 @@ $(PKG_BUILD_DIR)/.configured: --disable-auto-modprobe \ --with-kernel=$(LINUX_DIR) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_KMOD_FUSE): mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) diff --git a/openwrt/package/glib/Makefile b/openwrt/package/glib/Makefile index 5b35fa1ce7..594d364830 100644 --- a/openwrt/package/glib/Makefile +++ b/openwrt/package/glib/Makefile @@ -66,15 +66,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared=yes \ --enable-static=yes \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_GLIB1): install -m0755 -d $(IDIR_GLIB1)/usr/lib @@ -107,4 +107,4 @@ uninstall-dev: rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc compile: install-dev -clean: uninstall-dev
\ No newline at end of file +clean: uninstall-dev diff --git a/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile index 10e95e70d4..3a002294f3 100644 --- a/openwrt/package/gmp/Makefile +++ b/openwrt/package/gmp/Makefile @@ -13,6 +13,7 @@ PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) @@ -44,15 +45,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBGMP): install -m0755 -d $(IDIR_LIBGMP)/usr/lib diff --git a/openwrt/package/haserl/Makefile b/openwrt/package/haserl/Makefile index 40e542dac3..d9e1faacc1 100644 --- a/openwrt/package/haserl/Makefile +++ b/openwrt/package/haserl/Makefile @@ -2,25 +2,23 @@ include $(TOPDIR)/rules.mk -PKG_NAME := haserl -PKG_VERSION := 0.8.0 -PKG_RELEASE := 1 -PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea - -PKG_SOURCE_URL := \ - @SF/haserl \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ -PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT := zcat - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_NAME:=haserl +PKG_VERSION:=0.8.0 +PKG_RELEASE:=1 +PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea + +PKG_SOURCE_URL:=@SF/haserl +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,HASERL,haserl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \ @@ -45,15 +43,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_HASERL): install -m0755 -d $(IDIR_HASERL)/usr/bin diff --git a/openwrt/package/howl/Makefile b/openwrt/package/howl/Makefile index bf844fbfaa..4eef06e4a8 100644 --- a/openwrt/package/howl/Makefile +++ b/openwrt/package/howl/Makefile @@ -51,15 +51,15 @@ $(PKG_BUILD_DIR)/.configured: --enable-shared \ --enable-static \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBHOWL): install -m0755 -d $(IDIR_LIBHOWL)/usr/lib diff --git a/openwrt/package/ipkg/Makefile b/openwrt/package/ipkg/Makefile index a0ec84a069..d68f60bb9d 100644 --- a/openwrt/package/ipkg/Makefile +++ b/openwrt/package/ipkg/Makefile @@ -45,16 +45,16 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_IPKG): install -d -m0755 $(IDIR_IPKG)/bin diff --git a/openwrt/package/libelf/Makefile b/openwrt/package/libelf/Makefile index 4e82c317fa..537c468fde 100644 --- a/openwrt/package/libelf/Makefile +++ b/openwrt/package/libelf/Makefile @@ -50,16 +50,16 @@ $(PKG_BUILD_DIR)/.configured: --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ - CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \ instroot="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBELF): install -d -m0755 $(IDIR_LIBELF)/usr/lib diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile index eaa45fcd8a..50ca47f801 100644 --- a/openwrt/package/libgd/Makefile +++ b/openwrt/package/libgd/Makefile @@ -18,7 +18,6 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBGD,libgd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ @@ -54,13 +53,15 @@ $(PKG_BUILD_DIR)/.configured: --without-x \ --with-png=$(STAGING_DIR)/usr \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install + touch $@ $(IPKG_LIBGD): install -d -m0755 $(IDIR_LIBGD)/usr/lib diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile index f628f1b35b..75aa248dad 100644 --- a/openwrt/package/libnet/Makefile +++ b/openwrt/package/libnet/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=1.0.2a PKG_RELEASE:=7 PKG_MD5SUM:=ddf53f0f484184390e8c2a1bd0853667 -PKG_SOURCE_URL:=\ - http://www.packetfactory.net/libnet/dist/deprecated/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://www.packetfactory.net/libnet/dist/deprecated/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat @@ -58,17 +56,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-static \ --with-pf_packet=yes \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so install -m0755 -d $(IDIR_LIBNET)/usr/lib diff --git a/openwrt/package/libosip2/Makefile b/openwrt/package/libosip2/Makefile index 2e7bb93dfc..c0b0357677 100644 --- a/openwrt/package/libosip2/Makefile +++ b/openwrt/package/libosip2/Makefile @@ -53,15 +53,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-semaphore \ --enable-ntimer \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBOSIP2): install -m0755 -d $(IDIR_LIBOSIP2)/usr/lib diff --git a/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile index bedebf2c7d..908c364a11 100644 --- a/openwrt/package/libpcap/Makefile +++ b/openwrt/package/libpcap/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=0.8.3 PKG_RELEASE:=1 PKG_MD5SUM:=56a9d4615d8354fcfe8cff8c8443c77b -PKG_SOURCE_URL:= \ - http://www.tcpdump.org/release \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://www.tcpdump.org/release/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat @@ -53,16 +51,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --with-build-cc=$(HOSTCC) \ --with-pcap=linux \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) \ - CCOPT="$(TARGET_CFLAGS)" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + CCOPT="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBPCAP): install -m0755 -d $(IDIR_LIBPCAP)/usr/lib diff --git a/openwrt/package/libtool/Makefile b/openwrt/package/libtool/Makefile index a6710368d5..3bfc7514c2 100644 --- a/openwrt/package/libtool/Makefile +++ b/openwrt/package/libtool/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=1.5.14 PKG_RELEASE:=1 PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec -PKG_SOURCE_URL:= \ - http://ftp.gnu.org/gnu/libtool/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/libtool/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat @@ -47,15 +45,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBLTDL): install -m0755 -d $(IDIR_LIBLTDL)/usr/lib diff --git a/openwrt/package/libusb/Makefile b/openwrt/package/libusb/Makefile index ae7782d93b..9420cb6da8 100644 --- a/openwrt/package/libusb/Makefile +++ b/openwrt/package/libusb/Makefile @@ -48,16 +48,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ - CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBUSB): install -m0755 -d $(IDIR_LIBUSB)/usr/lib diff --git a/openwrt/package/lighttpd/Makefile b/openwrt/package/lighttpd/Makefile index 7f0b0e768d..92ba78f908 100644 --- a/openwrt/package/lighttpd/Makefile +++ b/openwrt/package/lighttpd/Makefile @@ -80,15 +80,15 @@ $(PKG_BUILD_DIR)/.configured: --enable-static \ --with-openssl="$(STAGING_DIR)/usr" \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIGHTTPD): install -m0755 -d $(IDIR_LIGHTTPD)/etc diff --git a/openwrt/package/lzo/Makefile b/openwrt/package/lzo/Makefile index ceb4490719..81c749b0c0 100644 --- a/openwrt/package/lzo/Makefile +++ b/openwrt/package/lzo/Makefile @@ -47,16 +47,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --enable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS_O="$(TARGET_CFLAGS)" + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + CFLAGS_O="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBLZO): install -d -m0755 $(IDIR_LIBLZO)/usr/lib diff --git a/openwrt/package/ncurses/Makefile b/openwrt/package/ncurses/Makefile index d8fd4ff896..1bab2d9655 100644 --- a/openwrt/package/ncurses/Makefile +++ b/openwrt/package/ncurses/Makefile @@ -67,19 +67,19 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --with-shared \ --with-normal \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ BUILD_CC="$(TARGET_CC)" \ HOSTCC="$(HOSTCC)" \ - HOSTCCFLAGS="\$$(CPPFLAGS)" - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ + HOSTCCFLAGS="\$$(CPPFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBNCURSES): install -d -m0755 $(IDIR_LIBNCURSES)/usr/lib diff --git a/openwrt/package/nmap/Makefile b/openwrt/package/nmap/Makefile index 69cc9259bf..6e685b4ea6 100644 --- a/openwrt/package/nmap/Makefile +++ b/openwrt/package/nmap/Makefile @@ -51,17 +51,16 @@ $(PKG_BUILD_DIR)/.configured: --with-libpcap="$(STAGING_DIR)/usr" \ --with-libpcre="$(STAGING_DIR)/usr" \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_NMAP): install -d -m0755 $(IDIR_NMAP)/usr/share/nmap diff --git a/openwrt/package/openldap/Makefile b/openwrt/package/openldap/Makefile index 5ca37c9d56..f89c1e8c41 100644 --- a/openwrt/package/openldap/Makefile +++ b/openwrt/package/openldap/Makefile @@ -7,9 +7,7 @@ PKG_VERSION:=2.2.26 PKG_RELEASE:=1 PKG_MD5SUM:=afc8700b5738da863b30208e1d3e9de8 -PKG_SOURCE_URL:= \ - ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_CAT:=zcat @@ -36,10 +34,12 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBOPENLDAP,libopenldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - touch $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.configured: + touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ ./configure \ --target=$(GNU_HOST_NAME) \ @@ -95,12 +95,10 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(DISABLE_NLS) \ $(PKG_CONFIGURE_OPTIONS) \ ) - $(MAKE) -C $(PKG_BUILD_DIR) - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_LIBOPENLDAP): diff --git a/openwrt/package/osiris/Makefile b/openwrt/package/osiris/Makefile index ca7056dd66..b119f6e039 100644 --- a/openwrt/package/osiris/Makefile +++ b/openwrt/package/osiris/Makefile @@ -50,16 +50,16 @@ $(PKG_BUILD_DIR)/.configured: --with-osiris-user=root \ --with-root-dir=/var/lib/osiris \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ INTERACTIVE=0 \ - install - touch $(PKG_BUILD_DIR)/.built + all install + touch $@ $(IPKG_OSIRISD): install -d -m0755 $(IDIR_OSIRISD)/etc/init.d |