qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:41:53 +02:00
Code

cleanup & add whitespace

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3764 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2006-05-11 22:36:20 +00:00
parent d07c87f4db
commit a8fa433131
1 changed files with 94 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package/rules.mk
View File

@ -5,28 +5,24 @@ all: compile
endif endif
define Build/DefaultTargets define Build/DefaultTargets
$(PKG_BUILD_DIR)/.prepared: FORCE $(DL_DIR)/$(PKG_SOURCE) prepared: FORCE $(DL_DIR)/$(PKG_SOURCE)
ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.) ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.)
@-rm -rf $(PKG_BUILD_DIR) @-rm -rf $(PKG_BUILD_DIR)
@mkdir -p $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR)
$(call Build/Prepare) $(call Build/Prepare)
@touch $$@
endif endif
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.configured: prepared
$(call Build/Configure) $(call Build/Configure)
touch $$@ touch $$@
$(PKG_BUILD_DIR)/.built: FORCE $(PKG_BUILD_DIR)/.configured built: FORCE $(PKG_BUILD_DIR)/.configured
#$#$#(error $$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR))) ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$(PKG_BUILD_DIR))
$(call Build/Compile) $(call Build/Compile)
touch $$@
endif endif
package-clean: FORCE package-clean: FORCE
$(call Build/Clean) $(call Build/Clean)
rm -f $(PKG_BUILD_DIR)/.built
define Build/DefaultTargets define Build/DefaultTargets
endef endef
@ -48,17 +44,15 @@ TITLE:=
DESCRIPTION:= DESCRIPTION:=
endef endef
define RequiredField
ifeq ($$($(1)),)
$$(error Package/$$(1) is missing the $(1) field)
endif
endef
define BuildPackage define BuildPackage
$(eval $(call Package/Default)) $(eval $(call Package/Default))
$(eval $(call Package/$(1))) $(eval $(call Package/$(1)))
$(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, $(eval $(call RequiredField,$(FIELD)))) $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION,
ifeq ($($(FIELD)),)
$$(error Package/$(1) is missing the $(FIELD) field)
endif
)
ifeq ($(PKGARCH),) ifeq ($(PKGARCH),)
PKGARCH:=$(ARCH) PKGARCH:=$(ARCH)
@ -88,30 +82,34 @@ IDEPEND_$(1):=$$(strip $$(DEPENDS))
DUMPINFO += \ DUMPINFO += \
echo "Package: $(1)"; echo "Package: $(1)";
ifneq ($(MENU),) ifneq ($(MENU),)
DUMPINFO += \ DUMPINFO += \
echo "Menu: $(MENU)"; echo "Menu: $(MENU)";
endif endif
ifneq ($(DEFAULT),) ifneq ($(DEFAULT),)
DUMPINFO += \ DUMPINFO += \
echo "Default: $(DEFAULT)"; echo "Default: $(DEFAULT)";
endif endif
DUMPINFO += \ DUMPINFO += \
echo "Version: $(VERSION)"; \ echo "Version: $(VERSION)"; \
echo "Depends: $$(IDEPEND_$(1))"; \ echo "Depends: $$(IDEPEND_$(1))"; \
echo "Category: $(CATEGORY)"; \ echo "Category: $(CATEGORY)"; \
echo "Title: $(TITLE)"; \ echo "Title: $(TITLE)"; \
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
ifneq ($(URL),) ifneq ($(URL),)
DUMPINFO += \ DUMPINFO += \
echo; \ echo; \
echo "$(URL)"; echo "$(URL)";
endif endif
DUMPINFO += \ DUMPINFO += \
echo "@@"; echo "@@";
$$(IDIR_$(1))/CONTROL/control: prepared
$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
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
@ -127,7 +125,7 @@ $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
[ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \ [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
done done
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control built
$(call Package/$(1)/install,$$(IDIR_$(1))) $(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(RSTRIP) $$(IDIR_$(1)) $(RSTRIP) $$(IDIR_$(1))
@ -138,6 +136,7 @@ $$(INFO_$(1)): $$(IPKG_$(1))
$(1)-clean: $(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_* rm -f $(PACKAGE_DIR)/$(1)_*
clean: $(1)-clean clean: $(1)-clean
ifneq ($(__DEFAULT_TARGETS),1) ifneq ($(__DEFAULT_TARGETS),1)
@ -223,7 +222,7 @@ $(PACKAGE_DIR):
mkdir -p $@ mkdir -p $@
source: FORCE $(DL_DIR)/$(PKG_SOURCE) source: FORCE $(DL_DIR)/$(PKG_SOURCE)
prepare: FORCE $(PKG_BUILD_DIR)/.prepared prepare: FORCE prepared
configure: FORCE $(PKG_BUILD_DIR)/.configured configure: FORCE $(PKG_BUILD_DIR)/.configured
compile-targets: FORCE compile-targets: FORCE