All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 03/18] boa: convert to gentargets
Date: Sun, 26 Sep 2010 00:13:54 -0700	[thread overview]
Message-ID: <1285485249-29212-3-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1285485249-29212-1-git-send-email-Martin.Banky@gmail.com>

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 package/boa/boa.mk |   61 ++++++++++++++-------------------------------------
 1 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index a51de96..1b929b4 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -3,33 +3,19 @@
 # boa
 #
 #############################################################
+BOA_VERSION = 0.94.14rc21
+BOA_SOURCE = boa-$(BOA_VERSION).tar.gz
+BOA_SITE = http://www.boa.org/
+BOA_WORKDIR = $(BUILD_DIR)/boa_workdir
 
-BOA_VERSION=0.94.14rc21
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
-BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
-BOA_CAT:=$(ZCAT)
-BOA_SITE=http://www.boa.org/
-BOA_DIR=$(BUILD_DIR)/boa-$(BOA_VERSION)
-BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
-
-$(DL_DIR)/$(BOA_SOURCE):
-	$(call DOWNLOAD,$(BOA_SITE),$(BOA_SOURCE))
-
-$(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE)
-	$(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(BOA_DIR)/.unpacked
-
-$(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
+define BOA_CONFIGURE_CMDS
 	rm -f $(BOA_WORKDIR)/Makefile
 	mkdir -p $(BOA_WORKDIR)
 	#CONFIG_SITE=package/boa/boa-config.site-$(ARCH)
-	(cd $(BOA_WORKDIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
+	(cd $(BOA_WORKDIR); \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(BOA_DIR)/configure $(QUIET) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(@D)/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -46,14 +32,14 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 	)
-	touch $(BOA_WORKDIR)/Makefile
+endef
 
-$(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer: $(BOA_WORKDIR)/Makefile
-	rm -f $@
+define BOA_BUILD_CMDS
+	rm -f $(BOA_WORKDIR)/src/boa
 	$(MAKE) -C $(BOA_WORKDIR)
+endef
 
-$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer
-	mkdir -p $(TARGET_DIR)/usr/sbin
+define BOA_INSTALL_TARGET_CMDS
 	cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa
 	mkdir -p $(TARGET_DIR)/usr/lib/boa
 	cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
@@ -61,26 +47,13 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer
 	cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa
 	cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer
-	touch $(BOA_WORKDIR)/.installed
+endef
 
-boa: $(BOA_WORKDIR)/.installed
-
-boa-source: $(DL_DIR)/$(BOA_SOURCE)
-
-boa-clean:
+define BOA_CLEAN_CMDS
 	-$(MAKE) -C $(BOA_WORKDIR) clean
 	rm -rf $(TARGET_DIR)/usr/sbin/boa \
 		$(TARGET_DIR)/usr/lib/boa/boa_indexer \
 		$(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa
+endef
 
-boa-dirclean:
-	rm -rf $(BOA_DIR) $(BOA_WORKDIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BOA),y)
-TARGETS+=boa
-endif
+$(eval $(call GENTARGETS,package,boa))
-- 
1.7.3

  parent reply	other threads:[~2010-09-26  7:13 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-26  7:13 [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Martin Banky
2010-09-26  7:13 ` [Buildroot] [PATCH 02/18] axel: convert to gentargets and bump to 2.4 Martin Banky
2010-09-26 21:12   ` Peter Korsgaard
2010-09-26  7:13 ` Martin Banky [this message]
2010-09-26 19:21   ` [Buildroot] [PATCH 03/18] boa: convert to gentargets Peter Korsgaard
2010-09-26  7:13 ` [Buildroot] [PATCH 04/18] bsdiff: " Martin Banky
2010-09-26 19:54   ` Peter Korsgaard
2010-09-26  7:13 ` [Buildroot] [PATCH 05/18] boa: convert to autotargets Martin Banky
2010-09-26 19:55   ` Peter Korsgaard
2010-09-26 21:22     ` Martin Banky
2010-09-26 22:04       ` Peter Korsgaard
2010-09-26  7:13 ` [Buildroot] [PATCH 06/18] cvs: " Martin Banky
2010-09-30 12:34   ` Peter Korsgaard
2010-09-26  7:13 ` [Buildroot] [PATCH 07/18] dosfstools: convert to gentargets and bump to 3.0.10 Martin Banky
2010-09-26 20:26   ` Peter Korsgaard
2010-09-26  7:13 ` [Buildroot] [PATCH 08/18] ezxml: convert to gentargets Martin Banky
2010-09-26 12:35   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 09/18] fbset: " Martin Banky
2010-09-26 18:55   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 10/18] fconfig: convert to gentargets and bump to 20080329 Martin Banky
2010-09-29 20:15   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 11/18] gadgets-test: convert to gentargets Martin Banky
2010-09-29 20:27   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 12/18] hotplug: " Martin Banky
2010-09-26 20:14   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 13/18] hdparm: convert to gentargets and bump to 9.32 Martin Banky
2010-09-27 21:20   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 14/18] hwdata: convert to gentargets and bump to 0.230 Martin Banky
2010-09-26 20:35   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 15/18] liberation: convert to gentargets and bump to 1.06.0.20100721 Martin Banky
2010-09-29 20:30   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 16/18] lm-sensors: convert to gentargets and bump to 3.1.2 Martin Banky
2010-09-27 20:48   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 17/18] lockfile-progs: convert to gentargets and bump to 0.1.15 Martin Banky
2010-09-29 20:41   ` Peter Korsgaard
2010-09-26  7:14 ` [Buildroot] [PATCH 18/18] logrotate: convert to gentargets and bump to 3.7.9 Martin Banky
2010-09-26 20:54   ` Peter Korsgaard
2010-09-29 20:55 ` [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285485249-29212-3-git-send-email-Martin.Banky@gmail.com \
    --to=martin.banky@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.