fix iproute2 (ip & tc) build broken by [2333]

[openwrt.git] / openwrt / package / updatedd / Makefile

diff --git a/openwrt/package/updatedd/Makefile b/openwrt/package/updatedd/Makefile
index f55542c..cc88b5a 100644 (file)
--- a/openwrt/package/updatedd/Makefile
+++ b/openwrt/package/updatedd/Makefile
@@ -16,9 +16,38 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
+define PKG_mod_template
+
+$$(IPKG_$(1)):
+       install -d -m0755 $$(IDIR_$(1))/usr/lib/updatedd
+       install -m0755 $(PKG_INSTALL_DIR)/usr/lib/updatedd/$(2).so $$(IDIR_$(1))/usr/lib/updatedd/
+       $(RSTRIP) $$(IDIR_$(1))
+       $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+
+endef
+
 $(eval $(call PKG_template,UPDATEDD,updatedd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_CHANGEIP,updatedd-mod-changeip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_DYNDNS,updatedd-mod-dyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_EURODYNDNS,updatedd-mod-eurodyndns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_HN,updatedd-mod-hn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_NOIP,updatedd-mod-noip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_ODS,updatedd-mod-ods,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_CHANGEIP,changeip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_DYNDNS,dyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_EURODYNDNS,eurodyndns))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_HN,hn))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_NOIP,noip))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_ODS,ods))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_OVH,ovh))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_REGFISH,regfish))
+$(eval $(call PKG_mod_template,UPDATEDD_MOD_TZO,tzo))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -42,41 +71,10 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(IPKG_UPDATEDD):
+       install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d
+       install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/
        install -d -m0755 $(IDIR_UPDATEDD)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/updatedd
-
-       install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d/
-       install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/S55ddns
-
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/
        install -d -m0755 $(IDIR_UPDATEDD)/usr/lib/updatedd
-
-ifeq ($(BR2_PACKAGE_UPDATEDD_CHANGEIP),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/changeip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/changeip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_DYNDNS),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/dyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/dyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_EURODYNDNS),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/eurodyndns.so $(IDIR_UPDATEDD)/usr/lib/updatedd/eurodyndns.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_HN),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/hn.so $(IDIR_UPDATEDD)/usr/lib/updatedd/hn.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_NOIP),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/noip.so $(IDIR_UPDATEDD)/usr/lib/updatedd/noip.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_ODS),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ods.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ods.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_OVH),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/ovh.so $(IDIR_UPDATEDD)/usr/lib/updatedd/ovh.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_REGFISH),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/regfish.so $(IDIR_UPDATEDD)/usr/lib/updatedd/regfish.so
-endif
-ifeq ($(BR2_PACKAGE_UPDATEDD_TZO),y)
-       install -m0644 $(PKG_INSTALL_DIR)/usr/lib/updatedd/tzo.so $(IDIR_UPDATEDD)/usr/lib/updatedd/tzo.so
-endif
-
        $(RSTRIP) $(IDIR_UPDATEDD)
        $(IPKG_BUILD) $(IDIR_UPDATEDD) $(PACKAGE_DIR)