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

3 files changed, 58 insertions, 71 deletions

diff --git a/rules/libxml2.in b/rules/libxml2.in
index 4a23b481f..a91d39504 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -6,6 +6,7 @@
 menuconfig LIBXML2
         bool
         prompt "libxml2                     "
+        select ZLIB
 
 config LIBXML2_C14N
 	bool
@@ -13,9 +14,9 @@ config LIBXML2_C14N
 	depends on LIBXML2
 	prompt "C14N Support"
 	help
-	  Activate the W3C XML Canonicalisation (C14N) to serialize 
-	  the result of parsing to stdout. It keeps comments in the 
-	  result. 
+	  Activate the W3C XML Canonicalisation (C14N) to serialize
+	  the result of parsing to stdout. It keeps comments in the
+	  result.
 
 config LIBXML2_CATALOG
 	bool
@@ -24,12 +25,12 @@ config LIBXML2_CATALOG
 	prompt "Catalog support"
 	help
 	  Add the Catalog support.
-	  What is a catalog? Basically it's a lookup mechanism used 
-	  when an entity (a file or a remote resource) references 
-	  another entity. The catalog lookup is inserted between 
-	  the moment the reference is recognized by the software 
-	  (XML parser, stylesheet processing, or even images 
-	  referenced for inclusion in a rendering) and the time 
+	  What is a catalog? Basically it's a lookup mechanism used
+	  when an entity (a file or a remote resource) references
+	  another entity. The catalog lookup is inserted between
+	  the moment the reference is recognized by the software
+	  (XML parser, stylesheet processing, or even images
+	  referenced for inclusion in a rendering) and the time
 	  where loading that resource is actually started.
 	  http://xmlsoft.org/catalog.html
 
@@ -39,7 +40,7 @@ config LIBXML2_DEBUG
 	depends on LIBXML2
 	prompt "Debugging"
 	help
-	  Enable debugging support. 
+	  Enable debugging support.
 
 config LIBXML2_DOCBOOK
 	bool
@@ -55,7 +56,7 @@ config LIBXML2_FEXCEPTIONS
 	depends on LIBXML2
 	prompt "C++ Exception Support"
 	help
-	  Add GCC flag -fexceptions for C++ exceptions. 
+	  Add GCC flag -fexceptions for C++ exceptions.
 
 config LIBXML2_FTP
 	bool
@@ -71,7 +72,7 @@ config LIBXML2_HISTORY
 	depends on LIBXML2
 	prompt "History support for xmlling shell"
 	help
-	  This feature adds history support to the xmllint shell. 
+	  This feature adds history support to the xmllint shell.
 
 config LIBXML2_HTML
 	bool
@@ -79,7 +80,7 @@ config LIBXML2_HTML
 	depends on LIBXML2
 	prompt "HTML support"
 	help
-	  Add HTML support. 
+	  Add HTML support.
 
 config LIBXML2_HTML_DIR
 	string
@@ -87,7 +88,7 @@ config LIBXML2_HTML_DIR
 	depends on LIBXML2_HTML
 	prompt "HTML directory"
 	help
-	  Path to HTML base directory. 
+	  Path to HTML base directory.
 
 config LIBXML2_HTML_SUBDIR
 	string
@@ -95,7 +96,7 @@ config LIBXML2_HTML_SUBDIR
 	depends on LIBXML2_HTML
 	prompt "HTML sub directory"
 	help
-	  Directory used under HTML-dir. 
+	  Directory used under HTML-dir.
 
 config LIBXML2_HTTP
 	bool
@@ -103,15 +104,15 @@ config LIBXML2_HTTP
 	depends on LIBXML2
 	prompt "HTTP support"
 	help
-	  Add HTTP support. 
+	  Add HTTP support.
 
 config LIBXML2_ICONV
 	bool
 	default Y
-	depends on LIBXML2  
+	depends on LIBXML2
 	prompt "ICONV support"
 	help
-	  Add ICONV support. 
+	  Add ICONV support.
 
 config LIBXML2_ISO8859X
 	bool
@@ -119,7 +120,7 @@ config LIBXML2_ISO8859X
 	depends on LIBXML2
 	prompt "ISO8859x support if no ICONV"
 	help
-	  Add ISO8859X support if no iconv. 
+	  Add ISO8859X support if no iconv.
 
 config LIBXML2_LEGACY
 	bool
@@ -135,7 +136,7 @@ config LIBXML2_MEM_DEBUG
 	depends on LIBXML2
 	prompt "Memory Debugging Module"
 	help
-	  Add the memory debugging support. 
+	  Add the memory debugging support.
 
 config LIBXML2_MINIMUM
 	bool
@@ -151,7 +152,7 @@ config LIBXML2_OUTPUT
 	depends on LIBXML2
 	prompt "Output Serialization"
 	help
-	  Add the serialization support. 
+	  Add the serialization support.
 
 config LIBXML2_PATTERN
 	bool
@@ -167,14 +168,14 @@ config LIBXML2_PUSH
 	depends on LIBXML2
 	prompt "PUSH Parser"
 	help
-	  Add the PUSH parser interface. 
+	  Add the PUSH parser interface.
 
 config LIBXML2_PYTHON
 	bool
 	depends on LIBXML2
 	prompt "Python bindings"
 	help
-	  Build Python bindings if found. 
+	  Build Python bindings if found.
 
 config LIBXML2_READER
 	bool
@@ -182,7 +183,7 @@ config LIBXML2_READER
 	depends on LIBXML2
 	prompt "xmlReader Parsing Interface"
 	help
-	  Add the xmlReader parsing interface. 
+	  Add the xmlReader parsing interface.
 
 config LIBXML2_REGEXPS
 	bool
@@ -190,8 +191,8 @@ config LIBXML2_REGEXPS
 	depends on LIBXML2
 	prompt "Regular Expressions support"
 	help
-	  Add support for Regular Expressions. 
-	  
+	  Add support for Regular Expressions.
+
 #  --with-readline=DIR     use readline in DIR
 
 config LIBXML2_RUN_DEBUG
@@ -200,7 +201,7 @@ config LIBXML2_RUN_DEBUG
 	depends on LIBXML2
 	prompt "Enable Runtime Debugging"
 	help
-	  Enable runtime debugging module. 
+	  Enable runtime debugging module.
 
 config LIBXML2_SAX1
 	bool
@@ -232,16 +233,16 @@ config LIBXML2_THREADS_ALLOC
 	depends on LIBXML2
 	prompt "Per-Thread memory"
 	help
-	  Add per-thread memory. 
-	  
+	  Add per-thread memory.
+
 config LIBXML2_DOM
 	bool
 	default Y
 	depends on LIBXML2
 	prompt "DOM API"
 	help
-	  Add the DOM tree manipulation API. 
-	  
+	  Add the DOM tree manipulation API.
+
 config LIBXML2_DTD
 	bool
 	default Y
@@ -256,16 +257,16 @@ config LIBXML2_WRITER
 	depends on LIBXML2
 	prompt "xmlWriter support"
 	help
-	  Add XML Writer support. 
-	  
+	  Add XML Writer support.
+
 config LIBXML2_XINCLUDE
 	bool
 	default Y
 	depends on LIBXML2
 	prompt "XInclude"
 	help
-	  XInclude support. 
-	  
+	  XInclude support.
+
 config LIBXML2_XPATH
 	bool
 	default Y
@@ -273,7 +274,7 @@ config LIBXML2_XPATH
 	prompt "XPATH support"
 	help
 	  XPATH support
-	  
+
 config LIBXML2_XPTR
 	bool
 	default Y
@@ -288,5 +289,5 @@ config LIBXML2_MODULES
 	depends on LIBXML2
 	prompt "Dynamic Modules"
 	help
-	  Dynamic Modules support. 
+	  Dynamic Modules support.
 
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 7d4f0a3ed..2c0740c99 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -48,7 +48,7 @@ $(LIBXML2_SOURCE):
 
 libxml2_extract: $(STATEDIR)/libxml2.extract
 
-libxml2_extract_deps = $(STATEDIR)/libxml2.get
+libxml2_extract_deps = $(libxml2_extract_deps_default)
 
 $(STATEDIR)/libxml2.extract: $(libxml2_extract_deps)
 	@$(call targetinfo, $@)
@@ -66,11 +66,6 @@ libxml2_prepare: $(STATEDIR)/libxml2.prepare
 #
 # dependencies
 #
-libxml2_prepare_deps = \
-	$(STATEDIR)/libxml2.extract \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/zlib.install
-
 LIBXML2_PATH	=  PATH=$(CROSS_PATH)
 
 #
@@ -272,7 +267,7 @@ else
 LIBXML2_AUTOCONF += --without-modules
 endif
 
-$(STATEDIR)/libxml2.prepare: $(libxml2_prepare_deps)
+$(STATEDIR)/libxml2.prepare: $(libxml2_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBXML2_DIR)/config.cache)
 	cd $(LIBXML2_DIR) && \
@@ -286,9 +281,7 @@ $(STATEDIR)/libxml2.prepare: $(libxml2_prepare_deps)
 
 libxml2_compile: $(STATEDIR)/libxml2.compile
 
-libxml2_compile_deps = $(STATEDIR)/libxml2.prepare
-
-$(STATEDIR)/libxml2.compile: $(libxml2_compile_deps)
+$(STATEDIR)/libxml2.compile: $(libxml2_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(LIBXML2_DIR) && $(LIBXML2_PATH) make
 	@$(call touch, $@)
@@ -299,11 +292,11 @@ $(STATEDIR)/libxml2.compile: $(libxml2_compile_deps)
 
 libxml2_install: $(STATEDIR)/libxml2.install
 
-$(STATEDIR)/libxml2.install: $(STATEDIR)/libxml2.compile
+$(STATEDIR)/libxml2.install: $(libxml2_install_deps_default)
 	@$(call targetinfo, $@)
 	@$(call install, LIBXML2)
 	# FIXME: this probably has to be fixed upstream!
-	# libxml2 installs xml2-config to wrong path. 
+	# libxml2 installs xml2-config to wrong path.
 	mkdir -p $(PTXCONF_PREFIX)/bin
 	install $(LIBXML2_DIR)/xml2-config $(PTXCONF_PREFIX)/bin/
 	@$(call touch, $@)
@@ -314,10 +307,7 @@ $(STATEDIR)/libxml2.install: $(STATEDIR)/libxml2.compile
 
 libxml2_targetinstall: $(STATEDIR)/libxml2.targetinstall
 
-libxml2_targetinstall_deps = $(STATEDIR)/libxml2.compile \
-	$(STATEDIR)/zlib.targetinstall
-
-$(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps)
+$(STATEDIR)/libxml2.targetinstall: $(libxml2_install_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
@@ -328,15 +318,15 @@ $(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps)
 	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
 	@$(call install_fixup,DEPENDS,)
 	@$(call install_fixup,DESCRIPTION,missing)
-	
+
 	@$(call install_copy, 0, 0, 0644, \
 		$(LIBXML2_DIR)/.libs/libxml2.so.2.6.19, \
 		/usr/lib/libxml2.so.2.6.19)
 	@$(call install_link, libxml2.so.2.6.19, /usr/lib/libxml2.so.2)
 	@$(call install_link, libxml2.so.2.6.19, /usr/lib/libxml2.so)
-	
+
 	@$(call install_finish)
-	
+
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/zlib.make b/rules/zlib.make
index 74f93bcc9..d44590b8c 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project. 
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -14,7 +14,7 @@
 PACKAGES-$(PTXCONF_ZLIB) += zlib
 
 #
-# Paths and names 
+# Paths and names
 #
 ZLIB_VERSION		= 1.2.3
 ZLIB			= zlib-$(ZLIB_VERSION)
@@ -44,7 +44,7 @@ $(ZLIB_SOURCE):
 
 zlib_extract: $(STATEDIR)/zlib.extract
 
-$(STATEDIR)/zlib.extract: $(STATEDIR)/zlib.get
+$(STATEDIR)/zlib.extract: $(zlib_extract_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(ZLIB_DIR))
 	@$(call extract, $(ZLIB_SOURCE))
@@ -56,15 +56,11 @@ $(STATEDIR)/zlib.extract: $(STATEDIR)/zlib.get
 
 zlib_prepare: $(STATEDIR)/zlib.prepare
 
-zlib_prepare_deps = \
-	$(STATEDIR)/virtual-xchain.install \
-	$(STATEDIR)/zlib.extract
-
 ZLIB_PATH	= PATH=$(CROSS_PATH)
 ZLIB_ENV	= $(subst CFLAGS,SGALFC,$(CROSS_ENV)) AR="$(CROSS_AR) rc"
 ZLIB_AUTOCONF	= --shared --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
- 
-$(STATEDIR)/zlib.prepare: $(zlib_prepare_deps)
+
+$(STATEDIR)/zlib.prepare: $(zlib_prepare_deps_default)
 	@$(call targetinfo, $@)
 	cd $(ZLIB_DIR) && $(ZLIB_ENV) $(ZLIB_PATH) ./configure $(ZLIB_AUTOCONF)
 	@$(call touch, $@)
@@ -75,7 +71,7 @@ $(STATEDIR)/zlib.prepare: $(zlib_prepare_deps)
 
 zlib_compile: $(STATEDIR)/zlib.compile
 
-$(STATEDIR)/zlib.compile: $(STATEDIR)/zlib.prepare 
+$(STATEDIR)/zlib.compile: $(zlib_compile_deps_default)
 	@$(call targetinfo, $@)
 	$(ZLIB_ENV) $(ZLIB_PATH) cd $(ZLIB_DIR) && make
 	$(ZLIB_ENV) $(ZLIB_PATH) cd $(ZLIB_DIR) && make libz.a
@@ -87,7 +83,7 @@ $(STATEDIR)/zlib.compile: $(STATEDIR)/zlib.prepare
 
 zlib_install: $(STATEDIR)/zlib.install
 
-$(STATEDIR)/zlib.install: $(STATEDIR)/zlib.compile
+$(STATEDIR)/zlib.install: $(zlib_install_deps_default)
 	@$(call targetinfo, $@)
 	install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include
 	cd $(ZLIB_DIR) && $(ZLIB_PATH) $(MAKE_INSTALL)
@@ -100,7 +96,7 @@ $(STATEDIR)/zlib.install: $(STATEDIR)/zlib.compile
 
 zlib_targetinstall: $(STATEDIR)/zlib.targetinstall
 
-$(STATEDIR)/zlib.targetinstall: $(STATEDIR)/zlib.install
+$(STATEDIR)/zlib.targetinstall: $(zlib_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init,default)
@@ -124,8 +120,8 @@ $(STATEDIR)/zlib.targetinstall: $(STATEDIR)/zlib.install
 # Clean
 # ----------------------------------------------------------------------------
 
-zlib_clean: 
-	rm -rf $(STATEDIR)/zlib.* 
+zlib_clean:
+	rm -rf $(STATEDIR)/zlib.*
 	rm -rf $(IMAGEDIR)/zlib_*
 	rm -rf $(ZLIB_DIR)