* general rework

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@249 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 24 insertions, 37 deletions

diff --git a/rules/strace.make b/rules/strace.make
index 59a1a0b9e..eacd00fbf 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: strace.make,v 1.2 2003/08/19 12:01:59 robert Exp $
+# $Id: strace.make,v 1.3 2003/08/29 19:07:21 mkl Exp $
 #
 # (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # (c) 2003 by Pengutronix e.K., Hildesheim, Germany
@@ -23,7 +23,6 @@ STRACE			= strace-4.4.98
 STRACE_URL		= http://umn.dl.sourceforge.net/sourceforge/strace/$(STRACE).tar.bz2
 STRACE_SOURCE		= $(SRCDIR)/$(STRACE).tar.bz2
 STRACE_DIR		= $(BUILDDIR)/$(STRACE)
-STRACE_EXTRACT 		= bzip2 -dc
 
 STRACE_PTXPATCH		= strace-4.4.98-gds1.diff
 STRACE_PTXPATCH_URL	= http://www.pengutronix.de/software/ptxdist/temporary-src/$(STRACE_PTXPATCH)
@@ -45,11 +44,11 @@ $(STATEDIR)/strace-ptxpatch.get: $(STRACE_PTXPATCH_SOURCE)
 
 $(STRACE_SOURCE):
 	@$(call targetinfo, strace.get)
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(STRACE_URL)
+	@$(call get, $(STRACE_URL))
 
 $(STRACE_PTXPATCH_SOURCE):
 	@$(call targetinfo, strace-ptxpatch.get)
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(STRACE_PTXPATCH_URL)
+	@$(call get, $(STRACE_PTXPATCH_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -57,9 +56,13 @@ $(STRACE_PTXPATCH_SOURCE):
 
 strace_extract: $(STATEDIR)/strace.extract
 
-$(STATEDIR)/strace.extract: $(STATEDIR)/strace.get $(STATEDIR)/strace-ptxpatch.get
+strace_extract_deps = \
+	$(STATEDIR)/strace.get \
+	$(STATEDIR)/strace-ptxpatch.get
+
+$(STATEDIR)/strace.extract: $(strace_extract_deps)
 	@$(call targetinfo, strace.extract)
-	$(STRACE_EXTRACT) $(STRACE_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+	@$(call extract, $(STRACE_SOURCE))
 	cd $(STRACE_DIR) && patch -p1 < $(STRACE_PTXPATCH_SOURCE)
 	touch $@
 
@@ -69,52 +72,35 @@ $(STATEDIR)/strace.extract: $(STATEDIR)/strace.get $(STATEDIR)/strace-ptxpatch.g
 
 strace_prepare: $(STATEDIR)/strace.prepare
 
+strace_prepare_deps = \
+	$(STATEDIR)/strace.extract \
+	$(STATEDIR)/virtual-xchain.install
+
+STRACE_PATH	=  PATH=$(CROSS_PATH)
+STRACE_ENV	=  $(CROSS_ENV)
+
 STRACE_AUTOCONF	=  --build=$(GNU_HOST)
 STRACE_AUTOCONF	+= --host=$(PTXCONF_GNU_TARGET)
 STRACE_AUTOCONF	+= --target=$(PTXCONF_GNU_TARGET)
 STRACE_AUTOCONF	+= --disable-sanity-checks
 STRACE_AUTOCONF	+= --prefix=$(ROOTDIR)
-STRACE_ENVIRONMENT=  PATH=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(PTXCONF_PREFIX)/bin:$$PATH
-STRACE_ENVIRONMENT+= ac_cv_func_setvbuf_reversed=no strace_cv_have_mbstate_t=yes
-STRACE_MAKEVARS	=  AR=$(PTXCONF_GNU_TARGET)-ar
-STRACE_MAKEVARS	+= RANLIB=$(PTXCONF_GNU_TARGET)-ranlib
-STRACE_MAKEVARS	+= CC=$(PTXCONF_GNU_TARGET)-gcc
-
-
-#
-# dependencies
-#
-strace_prepare_deps =  $(STATEDIR)/strace.extract 
-ifeq (y,$(PTXCONF_BUILD_CROSSCHAIN))
-strace_prepare_deps += $(STATEDIR)/xchain-gccstage2.install
-endif
-
 
 $(STATEDIR)/strace.prepare: $(strace_prepare_deps)
 	@$(call targetinfo, strace.prepare)
-	mkdir -p $(BUILDDIR)/$(STRACE)
-	cd $(BUILDDIR)/$(STRACE) &&					\
-		$(STRACE_ENVIRONMENT)					\
-		$(STRACE_DIR)/configure $(STRACE_AUTOCONF)
+	cd $(STRACE_DIR) && \
+		$(NCURSES_PATH) $(NCURSES_ENV) \
+		./configure $(STRACE_AUTOCONF)
 	touch $@
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-strace_compile_deps = $(STATEDIR)/strace.prepare
-ifeq (y, $(PTXCONF_GLIBC))
-strace_compile_deps += $(STATEDIR)/glibc.install
-endif
-ifeq (y, $(PTXCONF_UCLIBC))
-strace_compile_deps += $(STATEDIR)/uclibc.install
-endif
-
 strace_compile: $(STATEDIR)/strace.compile
 
 $(STATEDIR)/strace.compile: $(STATEDIR)/strace.prepare 
 	@$(call targetinfo, strace.compile)
-	$(STRACE_ENVIRONMENT) make -C $(STRACE_DIR) $(STRACE_MAKEVARS) $(MAKEPARMS)
+	$(STRACE_PATH) $(STRACE_ENV) make -C $(STRACE_DIR)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -133,10 +119,11 @@ $(STATEDIR)/strace.install: $(STATEDIR)/strace.compile
 
 strace_targetinstall: $(STATEDIR)/strace.targetinstall
 
-$(STATEDIR)/strace.targetinstall: $(STATEDIR)/strace.install
+$(STATEDIR)/strace.targetinstall: $(STATEDIR)/strace.compile
 	@$(call targetinfo, strace.targetinstall)
-	$(CROSSSTRIP) $(STRACE_DIR)/strace
-	cp $(STRACE_DIR)/strace $(ROOTDIR)/bin
+	install -d $(ROOTDIR)/bin
+	install $(STRACE_DIR)/strace $(ROOTDIR)/bin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/strace
 	touch $@
 
 # ----------------------------------------------------------------------------