diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-01-11 07:25:24 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-01-11 07:25:24 +0000 |
| commit | d63be65938b25543b9fa8361994cfeeb1c9f6a66 (patch) | |
| tree | 2241cb4105beb8940163ec8c5701d683d2c1db43 /rules/commoncpp2.make | |
| parent | 83bcf79b8b5e7c5ba6cd402a0c0de4b6e0942fbe (diff) | |
| download | ptxdist-d63be65938b25543b9fa8361994cfeeb1c9f6a66.tar.gz ptxdist-d63be65938b25543b9fa8361994cfeeb1c9f6a66.tar.xz | |
fix dependencies; fix install paths
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.9-trunk@3781 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/commoncpp2.make')
| -rw-r--r-- | rules/commoncpp2.make | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index 259237b7d..05aa5b543 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -32,13 +32,11 @@ COMMONCPP2_DIR = $(BUILDDIR)/$(COMMONCPP2) commoncpp2_get: $(STATEDIR)/commoncpp2.get -commoncpp2_get_deps = $(COMMONCPP2_SOURCE) - $(STATEDIR)/commoncpp2.get: $(commoncpp2_get_deps) @$(call targetinfo, $@) @$(call touch, $@) -$(COMMONCPP2_SOURCE): +$(COMMONCPP2_SOURCE): $(COMMONCPP2_SOURCE) @$(call targetinfo, $@) @$(call get, $(COMMONCPP2_URL)) @@ -48,9 +46,7 @@ $(COMMONCPP2_SOURCE): commoncpp2_extract: $(STATEDIR)/commoncpp2.extract -commoncpp2_extract_deps = $(STATEDIR)/commoncpp2.get - -$(STATEDIR)/commoncpp2.extract: $(commoncpp2_extract_deps) +$(STATEDIR)/commoncpp2.extract: $(commoncpp2_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(COMMONCPP2_DIR)) @$(call extract, $(COMMONCPP2_SOURCE)) @@ -63,13 +59,6 @@ $(STATEDIR)/commoncpp2.extract: $(commoncpp2_extract_deps) commoncpp2_prepare: $(STATEDIR)/commoncpp2.prepare -# -# dependencies -# -commoncpp2_prepare_deps = \ - $(STATEDIR)/commoncpp2.extract \ - $(STATEDIR)/virtual-xchain.install - COMMONCPP2_PATH = PATH=$(CROSS_PATH) COMMONCPP2_ENV = $(CROSS_ENV) COMMONCPP2_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig @@ -80,7 +69,7 @@ COMMONCPP2_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig COMMONCPP2_AUTOCONF = $(CROSS_AUTOCONF_USR) COMMONCPP2_AUTOCONF += --prefix=$(CROSS_LIB_DIR) -$(STATEDIR)/commoncpp2.prepare: $(commoncpp2_prepare_deps) +$(STATEDIR)/commoncpp2.prepare: $(commoncpp2_prepare_deps_default) @$(call targetinfo, $@) @$(call clean, $(COMMONCPP2_DIR)/config.cache) cd $(COMMONCPP2_DIR) && \ @@ -94,9 +83,7 @@ $(STATEDIR)/commoncpp2.prepare: $(commoncpp2_prepare_deps) commoncpp2_compile: $(STATEDIR)/commoncpp2.compile -commoncpp2_compile_deps = $(STATEDIR)/commoncpp2.prepare - -$(STATEDIR)/commoncpp2.compile: $(commoncpp2_compile_deps) +$(STATEDIR)/commoncpp2.compile: $(commoncpp2_compile_deps_default) @$(call targetinfo, $@) cd $(COMMONCPP2_DIR) && $(COMMONCPP2_ENV) $(COMMONCPP2_PATH) make @$(call touch, $@) @@ -107,7 +94,7 @@ $(STATEDIR)/commoncpp2.compile: $(commoncpp2_compile_deps) commoncpp2_install: $(STATEDIR)/commoncpp2.install -$(STATEDIR)/commoncpp2.install: $(STATEDIR)/commoncpp2.compile +$(STATEDIR)/commoncpp2.install: $(commoncpp2_install_deps_default) @$(call targetinfo, $@) @$(call install, COMMONCPP2) @$(call touch, $@) @@ -118,9 +105,7 @@ $(STATEDIR)/commoncpp2.install: $(STATEDIR)/commoncpp2.compile commoncpp2_targetinstall: $(STATEDIR)/commoncpp2.targetinstall -commoncpp2_targetinstall_deps = $(STATEDIR)/commoncpp2.compile - -$(STATEDIR)/commoncpp2.targetinstall: $(commoncpp2_targetinstall_deps) +$(STATEDIR)/commoncpp2.targetinstall: $(commoncpp2_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) @@ -136,15 +121,15 @@ $(STATEDIR)/commoncpp2.targetinstall: $(commoncpp2_targetinstall_deps) $(COMMONCPP2_DIR)/src/.libs/libccgnu2-1.3.so.1.0.18, \ /usr/lib/libccgnu2-1.3.so.1.0.18) - @$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib//usr/lib/libccgnu2-1.3.so.1) - @$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib//usr/lib/libccgnu2-1.3.so) + @$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so.1) + @$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so) @$(call install_copy, 0, 0, 0644, \ - $(COMMONCPP2_DIR)/src/.libs/libccext2-1.3.so.1.0.18 \ - libccext2-1.3.so.1.0.18) + $(COMMONCPP2_DIR)/src/.libs/libccext2-1.3.so.1.0.18, \ + /usr/lib/libccext2-1.3.so.1.0.18) - @$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib//usr/lib/libccext2-1.3.so.1) - @$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib//usr/lib/libccext2-1.3.so) + @$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so.1) + @$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so) @$(call install_finish) |