1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-06-02 04:46:16 +02:00

cleanup & add whitespace

SVN-Revision: 3764
This commit is contained in:
Mike Baker 2006-05-11 22:36:20 +00:00
parent be9cc65a95
commit 3b1260256e

View File

@ -1,117 +1,115 @@
ifneq ($(DUMP),) ifneq ($(DUMP),)
all: dumpinfo all: dumpinfo
else else
all: compile 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
endef endef
define Package/Default define Package/Default
CONFIGFILE:= CONFIGFILE:=
SECTION:=opt SECTION:=opt
CATEGORY:=Extra packages CATEGORY:=Extra packages
DEPENDS:= DEPENDS:=
MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org> MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
PKGARCH:=$(ARCH) PKGARCH:=$(ARCH)
PRIORITY:=optional PRIORITY:=optional
DEFAULT:= DEFAULT:=
MENU:= MENU:=
TITLE:= TITLE:=
DESCRIPTION:= DESCRIPTION:=
endef
define RequiredField
ifeq ($$($(1)),)
$$(error Package/$$(1) is missing the $(1) field)
endif
endef 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)
endif endif
ifeq ($(DESCRIPTION),) ifeq ($(DESCRIPTION),)
$(eval DESCRIPTION:=$(TITLE)) $(eval DESCRIPTION:=$(TITLE))
endif endif
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
COMPILE_$(1):=1 COMPILE_$(1):=1
endif endif
ifeq ($(CONFIG_PACKAGE_$(1)),y) ifeq ($(CONFIG_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1)) install-targets: $$(INFO_$(1))
endif endif
ifneq ($(COMPILE_$(1)),) ifneq ($(COMPILE_$(1)),)
compile-targets: $(IPKG_$(1)) compile-targets: $(IPKG_$(1))
endif endif
IDEPEND_$(1):=$$(strip $$(DEPENDS)) IDEPEND_$(1):=$$(strip $$(DEPENDS))
DUMPINFO += \ DUMPINFO += \
echo "Package: $(1)"; echo "Package: $(1)";
ifneq ($(MENU),)
DUMPINFO += \ ifneq ($(MENU),)
DUMPINFO += \
echo "Menu: $(MENU)"; echo "Menu: $(MENU)";
endif endif
ifneq ($(DEFAULT),)
DUMPINFO += \ ifneq ($(DEFAULT),)
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),)
DUMPINFO += \ ifneq ($(URL),)
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,32 +125,33 @@ $$(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))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
$$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1)) $(IPKG) install $$(IPKG_$(1))
$(1)-clean: $(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_* rm -f $(PACKAGE_DIR)/$(1)_*
clean: $(1)-clean
ifneq ($(__DEFAULT_TARGETS),1) clean: $(1)-clean
$$(eval $$(call Build/DefaultTargets,$(1)))
endif ifneq ($(__DEFAULT_TARGETS),1)
$$(eval $$(call Build/DefaultTargets,$(1)))
endif
endef endef
ifneq ($(strip $(PKG_SOURCE)),) ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE): $(DL_DIR)/$(PKG_SOURCE):
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
endif endif
ifneq ($(strip $(PKG_CAT)),) ifneq ($(strip $(PKG_CAT)),)
define Build/Prepare/Default define Build/Prepare/Default
@if [ "$(PKG_CAT)" = "unzip" ]; then \ @if [ "$(PKG_CAT)" = "unzip" ]; then \
unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \ unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
else \ else \
@ -161,11 +160,11 @@ define Build/Prepare/Default
@if [ -d ./patches ]; then \ @if [ -d ./patches ]; then \
$(PATCH) $(PKG_BUILD_DIR) ./patches ; \ $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
fi fi
endef endef
endif endif
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
endef endef
define Build/Configure/Default define Build/Configure/Default
@ -193,7 +192,7 @@ define Build/Configure/Default
endef endef
define Build/Configure define Build/Configure
$(call Build/Configure/Default,) $(call Build/Configure/Default,)
endef endef
define Build/Compile/Default define Build/Compile/Default
@ -207,7 +206,7 @@ define Build/Compile/Default
endef endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default) $(call Build/Compile/Default)
endef endef
define Build/Clean define Build/Clean
@ -215,25 +214,25 @@ define Build/Clean
endef endef
ifneq ($(DUMP),) ifneq ($(DUMP),)
dumpinfo: dumpinfo:
$(DUMPINFO) $(DUMPINFO)
else else
$(PACKAGE_DIR): $(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
compile: FORCE compile-targets compile: FORCE compile-targets
install-targets: FORCE install-targets: FORCE
install: FORCE install-targets install: FORCE install-targets
clean-targets: FORCE clean-targets: FORCE
clean: FORCE clean: FORCE
@$(MAKE) clean-targets @$(MAKE) clean-targets
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
endif endif