hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor makefile tweaks 

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4393 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Mike Baker 2006-08-02 12:07:14 +00:00
parent b9475586bd
commit cfa303fd2b
3 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -14,8 +14,7 @@ RELEASE:=Kamikaze
# Just run 'make menuconfig', configure stuff, then run 'make'. # Just run 'make menuconfig', configure stuff, then run 'make'.
# You shouldn't need to mess with anything beyond this point... # You shouldn't need to mess with anything beyond this point...
#-------------------------------------------------------------- #--------------------------------------------------------------
TOPDIR=${shell pwd} export TOPDIR=${shell pwd}
export TOPDIR
include $(TOPDIR)/include/verbose.mk include $(TOPDIR)/include/verbose.mk
OPENWRTVERSION:=$(RELEASE) OPENWRTVERSION:=$(RELEASE)
@ -40,7 +39,7 @@ endif
@echo Collecting package info... @echo Collecting package info...
@-for dir in package/*/; do \ @-for dir in package/*/; do \
echo Source-Makefile: $${dir}Makefile; \ echo Source-Makefile: $${dir}Makefile; \
$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || echo "ERROR: please fix package/$${dir}/Makefile" >&2; \
done > $@ done > $@
.config.in: .pkginfo .config.in: .pkginfo
@ -129,5 +128,6 @@ distclean: dirclean config-clean
.SILENT: clean dirclean distclean config-clean download world .SILENT: clean dirclean distclean config-clean download world
FORCE: ;
.PHONY: FORCE .PHONY: FORCE
FORCE: %: ;

11
include/package.mk
View File

@ -40,19 +40,19 @@ define Build/DefaultTargets
$(call Build/Compile) $(call Build/Compile)
touch $$@ touch $$@
ifdef Build/InstallDev
$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/stampfiles mkdir -p $(STAGING_DIR)/stampfiles
$(call Build/InstallDev) $(call Build/InstallDev)
touch $$@ touch $$@
ifdef Build/InstallDev
compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
endif endif
package-clean: FORCE package-clean: FORCE
$(call Build/Clean) $(call Build/Clean)
$(call Build/UninstallDev) $(call Build/UninstallDev)
rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed -rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
package-rebuild: FORCE package-rebuild: FORCE
@-rm -f $(PKG_BUILD_DIR)/.built @-rm -f $(PKG_BUILD_DIR)/.built
@ -132,6 +132,7 @@ define BuildPackage
IDEPEND_$(1):=$$(strip $$(DEPENDS)) IDEPEND_$(1):=$$(strip $$(DEPENDS))
ifneq ($(DUMP),)
DUMPINFO += \ DUMPINFO += \
echo "Package: $(1)"; echo "Package: $(1)";
@ -176,13 +177,14 @@ define BuildPackage
echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
echo "@@"; echo "@@";
endif endif
endif
$(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),conffiles))
$(eval $(call BuildIPKGVariable,$(1),preinst)) $(eval $(call BuildIPKGVariable,$(1),preinst))
$(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm)) $(eval $(call BuildIPKGVariable,$(1),postrm))
$$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@ -204,7 +206,7 @@ define BuildPackage
$($(1)_COMMANDS) \ $($(1)_COMMANDS) \
) )
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
$(call Package/$(1)/install,$$(IDIR_$(1))) $(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name CVS | xargs rm -rf -find $$(IDIR_$(1)) -name CVS | xargs rm -rf
@ -227,7 +229,6 @@ define BuildPackage
@touch $$@ @touch $$@
$$(eval $$(call Build/DefaultTargets,$(1))) $$(eval $$(call Build/DefaultTargets,$(1)))
endef endef
ifneq ($(strip $(PKG_CAT)),) ifneq ($(strip $(PKG_CAT)),)

1
rules.mk
View File

@ -117,3 +117,4 @@ endif
all: all:
FORCE: ; FORCE: ;
.PHONY: FORCE .PHONY: FORCE
%: ;