ezxml: convert to gentargets

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 73b97625cc5fcb6a7e31a053e9de13dc2a22dc4b..fc5dad8f00e1d380e99a6beddec018186efa44f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,7 +19,7 @@
 
        Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
        bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
-       e2fsprogs, expat, freetype, gawk, gvfs, haserl, hostapd,
+       e2fsprogs, expat, ezxml, freetype, gawk, gvfs, haserl, hostapd,
        ifplugd, iperf, iproute2, iptables, jpeg, kexec, kismet, less,
        libcurl, libdnet, libevent, libglade, libgtk2, libiconv, libidn,
        libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,

diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk
index 3746b514e30592671f98be4bc2468b0b38f1fbdc..e29a7b522849fcdc0fd986262f7de0e4d38481b5 100644 (file)
--- a/package/ezxml/ezxml.mk
+++ b/package/ezxml/ezxml.mk
@@ -3,45 +3,23 @@
 # ezxml
 #
 #############################################################
+EZXML_VERSION = 0.8.6
+EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz
+EZXML_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/
+EZXML_INSTALL_STAGING=YES
 
-EZXML_VERSION:=0.8.6
-EZXML_SOURCE:=ezxml-$(EZXML_VERSION).tar.gz
-EZXML_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/
-EZXML_DIR:=$(BUILD_DIR)/ezxml
-
-$(DL_DIR)/$(EZXML_SOURCE):
-       $(call DOWNLOAD,$(EZXML_SITE),$(EZXML_SOURCE))
-
-$(EZXML_DIR)/.unpacked: $(DL_DIR)/$(EZXML_SOURCE)
-       $(ZCAT) $(DL_DIR)/$(EZXML_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       toolchain/patch-kernel.sh $(EZXML_DIR) package/ezxml/ ezxml-$(EZXML_VERSION)\*.patch
-       touch $@
-
-$(EZXML_DIR)/.configured: $(EZXML_DIR)/.unpacked
-       touch $@
-
-$(EZXML_DIR)/libezxml.a: $(EZXML_DIR)/.configured
+define EZXML_BUILD_CMDS
        $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) \
-       -f GNUmakefile -C $(EZXML_DIR)
-
-$(STAGING_DIR)/usr/lib/libezxml.a: $(EZXML_DIR)/libezxml.a
-       cp $(EZXML_DIR)/ezxml.h $(STAGING_DIR)/usr/include
-       cp $(EZXML_DIR)/libezxml.a $(STAGING_DIR)/usr/lib
+       -f GNUmakefile -C $(@D)
+endef
 
-ezxml: $(STAGING_DIR)/usr/lib/libezxml.a
+define EZXML_INSTALL_STAGING_CMDS
+       cp $(@D)/ezxml.h $(STAGING_DIR)/usr/include
+       cp $(@D)/libezxml.a $(STAGING_DIR)/usr/lib
+endef
 
-ezxml-source: $(DL_DIR)/$(EZXML_SOURCE)
+define EZXML_CLEAN_CMDS
+       -$(MAKE) -C $(@D) -f GNUmakefile clean
+endef
 
-ezxml-clean:
-       -$(MAKE) -C $(EZXML_DIR) -f GNUmakefile clean
-
-ezxml-dirclean:
-       rm -rf $(EZXML_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_EZXML),y)
-TARGETS+=ezxml
-endif
+$(eval $(call GENTARGETS,package,ezxml))