diff options
| -rw-r--r-- | rules/cppunit.make | 76 |
1 files changed, 10 insertions, 66 deletions
diff --git a/rules/cppunit.make b/rules/cppunit.make index e070c4d99..12edcb208 100644 --- a/rules/cppunit.make +++ b/rules/cppunit.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: cppunit.make $ # # Copyright (C) 2005 by Shahar Livne <shahar@livnex.com> +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -24,99 +24,43 @@ CPPUNIT_URL = $(PTXCONF_SETUP_SFMIRROR)/cppunit/$(CPPUNIT).$(CPPUNIT_SUFFIX) CPPUNIT_SOURCE = $(SRCDIR)/$(CPPUNIT).$(CPPUNIT_SUFFIX) CPPUNIT_DIR = $(BUILDDIR)/$(CPPUNIT) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -cppunit_get: $(STATEDIR)/cppunit.get - -$(STATEDIR)/cppunit.get: $(cppunit_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(CPPUNIT_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, CPPUNIT) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -cppunit_extract: $(STATEDIR)/cppunit.extract - -$(STATEDIR)/cppunit.extract: $(cppunit_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(CPPUNIT_DIR)) - @$(call extract, CPPUNIT) - @$(call patchin, CPPUNIT) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -cppunit_prepare: $(STATEDIR)/cppunit.prepare - -CPPUNIT_PATH = PATH=$(CROSS_PATH) -CPPUNIT_ENV = $(CROSS_ENV) -#CPPUNIT_ENV += +CPPUNIT_PATH := PATH=$(CROSS_PATH) +CPPUNIT_ENV := $(CROSS_ENV) # # autoconf # -CPPUNIT_AUTOCONF = $(CROSS_AUTOCONF_USR) - -$(STATEDIR)/cppunit.prepare: $(cppunit_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(CPPUNIT_DIR)/config.cache) - cd $(CPPUNIT_DIR) && \ - $(CPPUNIT_PATH) $(CPPUNIT_ENV) \ - ./configure $(CPPUNIT_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -cppunit_compile: $(STATEDIR)/cppunit.compile - -$(STATEDIR)/cppunit.compile: $(cppunit_compile_deps_default) - @$(call targetinfo, $@) - cd $(CPPUNIT_DIR) && $(CPPUNIT_ENV) $(CPPUNIT_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -cppunit_install: $(STATEDIR)/cppunit.install - -$(STATEDIR)/cppunit.install: $(cppunit_install_deps_default) - @$(call targetinfo, $@) - @$(call install, CPPUNIT) - @$(call touch, $@) +CPPUNIT_AUTOCONF := $(CROSS_AUTOCONF_USR) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -cppunit_targetinstall: $(STATEDIR)/cppunit.targetinstall - -$(STATEDIR)/cppunit.targetinstall: $(cppunit_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/cppunit.targetinstall: + @$(call targetinfo) @$(call install_init, cppunit) @$(call install_fixup, cppunit,PACKAGE,$(CPPUNIT)) @$(call install_fixup, cppunit,PRIORITY,optional) @$(call install_fixup, cppunit,VERSION,$(CPPUNIT_VERSION)) @$(call install_fixup, cppunit,SECTION,base) - @$(call install_fixup, cppunit,AUTHOR,"Shahar Livne <shahar\@livnex.com>") + @$(call install_fixup, cppunit,AUTHOR,"Shahar Livne <shahar@livnex.com>") @$(call install_fixup, cppunit,DEPENDS,) @$(call install_fixup, cppunit,DESCRIPTION,missing) - @$(call install_copy, cppunit, 0, 0, 0644, \ - $(CPPUNIT_DIR)/src/cppunit/.libs/libcppunit-1.12.so.1.0.0, \ + @$(call install_copy, cppunit, 0, 0, 0644, -, \ /usr/lib/libcppunit-1.12.so.1.0.0) @$(call install_link, cppunit, libcppunit-1.12.so.1.0.0, /usr/lib/libcppunit-1.10.so.1) @@ -124,7 +68,7 @@ $(STATEDIR)/cppunit.targetinstall: $(cppunit_targetinstall_deps_default) @$(call install_finish, cppunit) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |