summaryrefslogtreecommitdiffstats
path: root/rules/expat.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-04-05 22:50:36 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-04-05 22:50:36 +0000
commitb31a468d861f2f807cd5452b26fee5fca05aabd1 (patch)
tree4b0059aeef7c08ea0dc2d50af55602558209dd5c /rules/expat.make
parent72b9bbc60a74814c37cc6fcf9ef8f95690fa5f8b (diff)
downloadptxdist-b31a468d861f2f807cd5452b26fee5fca05aabd1.tar.gz
ptxdist-b31a468d861f2f807cd5452b26fee5fca05aabd1.tar.xz
[expat] cleanups, install from PKGDIR
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10244 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/expat.make')
-rw-r--r--rules/expat.make65
1 files changed, 6 insertions, 59 deletions
diff --git a/rules/expat.make b/rules/expat.make
index fe33a7c1e..a36bfad59 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -3,7 +3,7 @@
#
# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
# Pengutronix <info@pengutronix.de>, Germany
-# 2007 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2007, 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -30,35 +30,14 @@ EXPAT_DIR := $(BUILDDIR)/$(EXPAT)
# Get
# ----------------------------------------------------------------------------
-expat_get: $(STATEDIR)/expat.get
-
-$(STATEDIR)/expat.get:
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
$(EXPAT_SOURCE):
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call get, EXPAT)
# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-expat_extract: $(STATEDIR)/expat.extract
-
-$(STATEDIR)/expat.extract:
- @$(call targetinfo, $@)
- @$(call clean, $(EXPAT_DIR))
- @$(call extract, EXPAT)
- @$(call patchin, EXPAT)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-expat_prepare: $(STATEDIR)/expat.prepare
-
EXPAT_PATH := PATH=$(CROSS_PATH)
EXPAT_ENV := $(CROSS_ENV)
@@ -67,61 +46,29 @@ EXPAT_ENV := $(CROSS_ENV)
#
EXPAT_AUTOCONF := $(CROSS_AUTOCONF_USR)
-$(STATEDIR)/expat.prepare:
- @$(call targetinfo, $@)
- @$(call clean, $(EXPAT_DIR)/config.cache)
- cd $(EXPAT_DIR) && \
- $(EXPAT_PATH) $(EXPAT_ENV) \
- ./configure $(EXPAT_AUTOCONF)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-expat_compile: $(STATEDIR)/expat.compile
-
-$(STATEDIR)/expat.compile:
- @$(call targetinfo, $@)
- cd $(EXPAT_DIR) && $(EXPAT_PATH) $(MAKE) $(PARALLELMFLAGS)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-expat_install: $(STATEDIR)/expat.install
-
-$(STATEDIR)/expat.install:
- @$(call targetinfo, $@)
- @$(call install, EXPAT)
- @$(call touch, $@)
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-expat_targetinstall: $(STATEDIR)/expat.targetinstall
-
$(STATEDIR)/expat.targetinstall:
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call install_init, expat)
@$(call install_fixup, expat,PACKAGE,expat)
@$(call install_fixup, expat,PRIORITY,optional)
@$(call install_fixup, expat,VERSION,$(EXPAT_VERSION))
@$(call install_fixup, expat,SECTION,base)
- @$(call install_fixup, expat,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+ @$(call install_fixup, expat,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, expat,DEPENDS,)
@$(call install_fixup, expat,DESCRIPTION,missing)
- @$(call install_copy, expat, 0, 0, 0644, $(EXPAT_DIR)/.libs/libexpat.so.1.5.2, /usr/lib/libexpat.so.1.5.2)
+ @$(call install_copy, expat, 0, 0, 0644, -, /usr/lib/libexpat.so.1.5.2)
@$(call install_link, expat, libexpat.so.1.5.2, /usr/lib/libexpat.so.1)
@$(call install_link, expat, libexpat.so.1.5.2, /usr/lib/libexpat.so)
@$(call install_finish, expat)
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Clean