Changeset 817


Ignore:
Timestamp:
2005-05-09T11:33:23+02:00 (13 years ago)
Author:
nbd
Message:

merge nico's package/rules.mk and package/templates.mk into one file, update packages that use this

Location:
trunk/openwrt/package
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/fuse/Makefile

    r696 r817  
    88PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d 
    99 
    10 PKG_SOURCE_URL:= \ 
    11         @SF/$(PKG_NAME) \ 
    12         http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ 
     10PKG_SOURCE_URL:=@SF/$(PKG_NAME) 
    1311PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1412PKG_CAT:=zcat 
     
    1715PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1816 
    19 include $(TOPDIR)/package/templates.mk 
     17include $(TOPDIR)/package/rules.mk 
    2018 
    2119$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2220$(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2321$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    24  
    25 COMPILE_TARGETS += install-dev 
    26 CLEAN_TARGETS += uninstall-dev 
    27  
    28 include $(TOPDIR)/package/rules.mk 
    2922 
    3023$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared 
     
    8477        cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \ 
    8578         $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ 
    86         $(RSTRIP_KMOD) $(IDIR_KMOD_FUSE) 
    8779        mkdir -p $(PACKAGE_DIR) 
    8880        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) 
     
    116108        rm -rf $(STAGING_DIR)/usr/lib/libfuse.{a,so*} 
    117109        rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc 
     110 
     111install: install-dev 
     112clean: uninstall-dev 
  • trunk/openwrt/package/pcre/Makefile

    r664 r817  
    88PKG_MD5SUM:=53976b62032fd5c76678274e5fd196b4 
    99 
    10 PKG_SOURCE_URL:= \ 
    11         ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ 
    12         http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ 
     10PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ 
    1311PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1412PKG_CAT:=zcat 
     
    1715PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1816 
    19 include $(TOPDIR)/package/templates.mk 
     17include $(TOPDIR)/package/rules.mk 
    2018 
    2119$(eval $(call PKG_template,LIBPCRE,libpcre,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    22  
    23 include $(TOPDIR)/package/rules.mk 
    24  
    25 COMPILE_TARGETS += install-dev 
    26 CLEAN_TARGETS += uninstall-dev 
    2720 
    2821$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared 
     
    9184          $(STAGING_DIR)/usr/lib/pkgconfig/libpcre.pc \ 
    9285          $(STAGING_DIR)/usr/share/man/man*/pcre* \ 
     86 
     87compile: install-dev 
     88clean: uninstall-dev 
  • trunk/openwrt/package/popt/Makefile

    r664 r817  
    1717PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1818 
    19 include $(TOPDIR)/package/templates.mk 
     19include $(TOPDIR)/package/rules.mk 
    2020 
    2121$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    22  
    23 include $(TOPDIR)/package/rules.mk 
    24  
    25 COMPILE_TARGETS += install-dev 
    26 CLEAN_TARGETS += uninstall-dev 
    2722 
    2823$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared 
     
    8075                DESTDIR="$(STAGING_DIR)" \ 
    8176                uninstall 
     77 
     78compile: install-dev 
     79clean: uninstall-dev 
  • trunk/openwrt/package/rules.mk

    r662 r817  
     1define PKG_template 
     2IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk 
     3IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2) 
     4INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list 
     5 
     6ifneq ($(BR2_PACKAGE_$(1)),) 
     7compile: $$(IPKG_$(1)) 
     8endif 
     9ifeq ($(BR2_PACKAGE_$(1)),y) 
     10install: $$(INFO_$(1)) 
     11endif 
     12 
     13$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared 
     14        $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) 
     15        for file in conffiles preinst postinst prerm postrm; do \ 
     16                [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \ 
     17        done 
     18 
     19$$(INFO_$(1)): $$(IPKG_$(1)) 
     20        $(IPKG) install $$(IPKG_$(1)) 
     21 
     22$(2)-clean: 
     23        rm -f $$(IPKG_$(1)) 
     24clean: $(2)-clean 
     25 
     26endef 
     27 
    128ifneq ($(strip $(PKG_SOURCE)),) 
    229$(DL_DIR)/$(PKG_SOURCE): 
     
    1845source: $(DL_DIR)/$(PKG_SOURCE) 
    1946prepare: $(PKG_BUILD_DIR)/.prepared 
    20 compile: $(COMPILE_TARGETS) 
    21 install: $(INSTALL_TARGETS) 
     47compile: 
     48install: 
    2249 
    23 clean: $(CLEAN_TARGETS) 
    24         rm -rf $(PKG_FILES) $(PKG_BUILD_DIR) 
     50clean:  
     51        rm -rf $(PKG_BUILD_DIR) 
    2552 
    2653.PHONY: all source prepare compile install clean 
  • trunk/openwrt/package/shfs/Makefile

    r684 r817  
    88PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe 
    99 
    10 PKG_SOURCE_URL := \ 
    11         @SF/shfs \ 
    12         http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ 
     10PKG_SOURCE_URL := @SF/shfs 
    1311PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1412PKG_CAT := zcat 
     
    1816PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1917 
    20 include $(TOPDIR)/package/templates.mk 
     18include $(TOPDIR)/package/rules.mk 
    2119 
    2220$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2321$(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    24  
    25 include $(TOPDIR)/package/rules.mk 
    2622 
    2723$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared 
  • trunk/openwrt/package/snort/Makefile

    r789 r817  
    88PKG_MD5SUM:=06bf140893e7cb120aaa9372d10a0100 
    99 
    10 PKG_SOURCE_URL:= \ 
    11         http://www.snort.org/dl/current/ \ 
    12         http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ 
     10PKG_SOURCE_URL:=http://www.snort.org/dl/current/ 
    1311PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1412PKG_CAT:=zcat 
     
    1715PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1816 
    19 include $(TOPDIR)/package/templates.mk 
     17include $(TOPDIR)/package/rules.mk 
    2018 
    2119PKG_CONFIGURE_OPTS := \ 
     
    145143$(eval $(call PKG_build,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    146144 
    147 include $(TOPDIR)/package/rules.mk 
    148  
    149145$(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS) 
    150146        touch $(PKG_BUILD_DIR)/.built 
Note: See TracChangeset for help on using the changeset viewer.