From fc9e73f1e87c6e55223158c5d2e2fe8f9d3c2ce5 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Tue, 30 Aug 2011 21:07:33 +0200
Subject: Packages: convert more (almost all) packages to generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/x11/kbproto/kbproto.kconfig |  9 ++++
 packages/x11/kbproto/kbproto.mk      | 84 ++++++------------------------------
 2 files changed, 23 insertions(+), 70 deletions(-)

(limited to 'packages/x11/kbproto')

diff --git a/packages/x11/kbproto/kbproto.kconfig b/packages/x11/kbproto/kbproto.kconfig
index e8db9c7..eb1a3dc 100644
--- a/packages/x11/kbproto/kbproto.kconfig
+++ b/packages/x11/kbproto/kbproto.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_KBPROTO
 	bool "Have kbproto"
+	select EMBTK_KBPROTO_PKG_IS_TARBZ2
 	help
 		kbproto for X windowing system
 choice
@@ -44,3 +45,11 @@ config EMBTK_KBPROTO_VERSION_STRING
 	default "1.0.5"		if EMBTK_KBPROTO_VERSION_1_0_5
 	default "1.0.4"		if EMBTK_KBPROTO_VERSION_1_0_4
 
+config EMBTK_KBPROTO_NEED_PATCH
+	bool
+config EMBTK_KBPROTO_NEED_AUTORECONF
+	bool
+config EMBTK_KBPROTO_PKG_IS_TARGZ
+	bool
+config EMBTK_KBPROTO_PKG_IS_TARBZ2
+	bool
diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk
index 51ca611..adc07b2 100644
--- a/packages/x11/kbproto/kbproto.mk
+++ b/packages/x11/kbproto/kbproto.mk
@@ -23,74 +23,18 @@
 # \date         February 2010
 ################################################################################
 
-KBPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_KBPROTO_VERSION_STRING)))
-KBPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
-KBPROTO_PACKAGE := kbproto-$(KBPROTO_VERSION).tar.bz2
-KBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION)
-
-KBPROTO_BINS =
-KBPROTO_SBINS =
-KBPROTO_INCLUDES = X11/extensions/XKBgeom.h X11/extensions/XKB.h \
-		X11/extensions/XKBproto.h X11/extensions/XKBsrv.h \
-		X11/extensions/XKBstr.h
-KBPROTO_LIBS =
-KBPROTO_PKGCONFIGS = kbproto.pc
-
-kbproto_install:
-	@test -e $(KBPROTO_BUILD_DIR)/.installed || \
-	$(MAKE) $(KBPROTO_BUILD_DIR)/.installed
-
-$(KBPROTO_BUILD_DIR)/.installed: download_kbproto \
-	$(KBPROTO_BUILD_DIR)/.decompressed $(KBPROTO_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	kbproto-$(KBPROTO_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_kbproto:
-	$(call embtk_generic_message,"Downloading $(KBPROTO_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) \
-	$(KBPROTO_SITE)/$(KBPROTO_PACKAGE)
-
-$(KBPROTO_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(KBPROTO_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE)
-	@touch $@
-
-$(KBPROTO_BUILD_DIR)/.configured:
-	$(Q)cd $(KBPROTO_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) \
-	CXX=$(TARGETCXX_CACHED) \
-	AR=$(TARGETAR) \
-	RANLIB=$(TARGETRANLIB) \
-	AS=$(CROSS_COMPILE)as \
-	LD=$(TARGETLD) \
-	NM=$(TARGETNM) \
-	STRIP=$(TARGETSTRIP) \
-	OBJDUMP=$(TARGETOBJDUMP) \
-	OBJCOPY=$(TARGETOBJCOPY) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
-	CPPFLGAS="-I$(SYSROOT)/usr/include" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \
-	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
-	--disable-malloc0returnsnull
-	@touch $@
-
-kbproto_clean:
-	$(call embtk_generic_message,"cleanup kbproto...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(KBPROTO_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(KBPROTO_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(KBPROTO_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(KBPROTO_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(KBPROTO_PKGCONFIGS)
-	$(Q)-rm -rf $(KBPROTO_BUILD_DIR)*
+KBPROTO_NAME		:= kbproto
+KBPROTO_VERSION		:= $(call embtk_get_pkgversion,kbproto)
+KBPROTO_SITE		:= http://xorg.freedesktop.org/archive/individual/proto
+KBPROTO_PACKAGE		:= kbproto-$(KBPROTO_VERSION).tar.bz2
+KBPROTO_SRC_DIR		:= $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION)
+KBPROTO_BUILD_DIR	:= $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION)
+
+KBPROTO_BINS		=
+KBPROTO_SBINS		=
+KBPROTO_INCLUDES	= X11/extensions/XKBgeom.h X11/extensions/XKB.h		\
+			X11/extensions/XKBproto.h X11/extensions/XKBsrv.h	\
+			X11/extensions/XKBstr.h
+KBPROTO_LIBS		=
+KBPROTO_PKGCONFIGS	= kbproto.pc
 
-- 
cgit v1.2.3