From 271f31243c45ccc0f5e89b4cae16726c423cdb41 Mon Sep 17 00:00:00 2001
From: John Voltz <john.voltz@gmail.com>
Date: Thu, 6 Mar 2008 18:17:13 +0000
Subject: fixed lxdoom make

---
 package/lxdoom/lxdoom.mk | 92 +++++++++---------------------------------------
 1 file changed, 16 insertions(+), 76 deletions(-)

(limited to 'package/lxdoom/lxdoom.mk')

diff --git a/package/lxdoom/lxdoom.mk b/package/lxdoom/lxdoom.mk
index 273f87b48..b79fa6625 100644
--- a/package/lxdoom/lxdoom.mk
+++ b/package/lxdoom/lxdoom.mk
@@ -4,79 +4,19 @@
 #
 #############################################################
 
-LXDOOM_VERSION=1.4.4
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
-LXDOOM_SOURCE=lxdoom-$(LXDOOM_VERSION).tar.gz
-LXDOOM_CAT:=$(ZCAT)
-LXDOOM_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lxdoom
-
-LXDOOM_DIR=$(BUILD_DIR)/lxdoom-$(LXDOOM_VERSION)
-
-$(DL_DIR)/$(LXDOOM_SOURCE):
-	$(WGET) -P $(DL_DIR) $(LXDOOM_SITE)/$(LXDOOM_SOURCE)
-
-$(LXDOOM_DIR)/.unpacked: $(DL_DIR)/$(LXDOOM_SOURCE)
-	$(LXDOOM_CAT) $(DL_DIR)/$(LXDOOM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LXDOOM_DIR) package/lxdoom/ lxdoom-$(LXDOOM_VERSION)\*.patch
-	$(CONFIG_UPDATE) $(LXDOOM_DIR)
-	touch $(LXDOOM_DIR)/.unpacked
-
-$(LXDOOM_DIR)/Makefile: $(LXDOOM_DIR)/.unpacked
-	rm -f $(LXDOOM_DIR)/Makefile
-	mkdir -p $(LXDOOM_DIR)
-	(cd $(LXDOOM_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(LXDOOM_DIR)/configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--includedir=/usr/include \
-		--enable-shared \
-		$(DISABLE_NLS); \
-	)
-
-$(LXDOOM_DIR)/lxdoom: $(LXDOOM_DIR)/Makefile
-	rm -f $@
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LXDOOM_DIR)
-
-$(LXDOOM_DIR)/.installed: $(LXDOOM_DIR)/lxdoom
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LXDOOM_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/liblxdoom.la
-	touch $@
-
-$(TARGET_DIR)/usr/bin/lxdoomdec: $(LXDOOM_DIR)/.installed
-	cp -dpf $(STAGING_DIR)/usr/bin/lxdoomdec $(TARGET_DIR)/usr/bin/lxdoomdec
-
-$(TARGET_DIR)/usr/bin/lxdoomenc: $(TARGET_DIR)/usr/bin/lxdoomdec
-	cp -dpf $(STAGING_DIR)/usr/bin/lxdoomenc $(TARGET_DIR)/usr/bin/lxdoomenc
-
-$(TARGET_DIR)/usr/lib/liblxdoom.so: $(TARGET_DIR)/usr/bin/lxdoomenc
-	cp -dpf $(STAGING_DIR)/usr/lib/liblxdoom.so* $(TARGET_DIR)/usr/lib
-
-lxdoom-bins:	
-
-lxdoom: uclibc libogg $(TARGET_DIR)/usr/lib/liblxdoom.so
-
-lxdoom-source: $(DL_DIR)/$(LXDOOM_SOURCE)
-
-lxdoom-clean:
-	@if [ -d $(LXDOOM_DIR)/Makefile ]; then \
-		$(MAKE) -C $(LXDOOM_DIR) clean; \
-	fi
-
-lxdoom-dirclean:
-	rm -rf $(LXDOOM_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LXDOOM)),y)
-TARGETS+=lxdoom
-endif
+LXDOOM_VERSION = 1.4.4
+LXDOOM_SOURCE = lxdoom-$(LXDOOM_VERSION).tar.gz
+LXDOOM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lxdoom
+LXDOOM_AUTORECONF = NO
+LXDOOM_INSTALL_STAGING = NO
+LXDOOM_INSTALL_TARGET = YES
+LXDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+LXDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) --prefix=/usr \
+		--includedir=/usr/include --enable-shared \
+		$(DISABLE_NLS)
+
+LXDOOM_DEPENDENCIES = uclibc  
+
+$(eval $(call AUTOTARGETS,package,lxdoom))
\ No newline at end of file
-- 
cgit v1.2.3