From 18aec5b03eeebcb616ec12fd22eff237b47eadfb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 28 Sep 2010 16:41:21 +0200 Subject: rework build dependencies --- package/Makefile | 19 +++++++++++-------- package/gcc/Makefile | 13 ------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/package/Makefile b/package/Makefile index 12058a8dd..039a83e30 100644 --- a/package/Makefile +++ b/package/Makefile @@ -7,9 +7,11 @@ include $(TOPDIR)/rules.mk ifeq (${ADK_TARGET_LIB_GLIBC},y) package-$(ADK_PACKAGE_GLIBC) += glibc +gcc-compile: glibc-compile endif ifeq (${ADK_TARGET_LIB_EGLIBC},y) package-$(ADK_PACKAGE_EGLIBC) += eglibc +gcc-compile: eglibc-compile endif ifeq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_LIBC) += libc @@ -21,6 +23,7 @@ endif ifneq (${ADK_TARGET_LIB_GLIBC},y) ifneq (${ADK_NATIVE},y) package-$(ADK_PACKAGE_UCLIBC) += uclibc +gcc-compile: uclibc-compile endif package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++ endif @@ -65,13 +68,13 @@ $(TARGET_DIR): $(END_TRACE) %-install: - @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " - @$(MAKE) -C $(patsubst %-install,%,$@) install - @$(CMD_TRACE) " done" - @$(END_TRACE) + $(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " + $(MAKE) -C $(patsubst %-install,%,$@) install + $(CMD_TRACE) " done" + $(END_TRACE) %-clean: - @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: " - @$(MAKE) -C $(patsubst %-clean,%,$@) clean - @$(CMD_TRACE) " done" - @$(END_TRACE) + $(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: " + $(MAKE) -C $(patsubst %-clean,%,$@) clean + $(CMD_TRACE) " done" + $(END_TRACE) diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 000b9d98c..c8f3afc2f 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,19 +10,6 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libmpc libgmp mpfr PKG_BUILDDEP:= mpc gmp mpfr -ifeq ($(ADK_TARGET_LIB_UCLIBC),y) -PKG_DEPENDS+= uclibc-dev -PKG_BUILDDEP+= uclibc -endif -ifeq ($(ADK_TARGET_LIB_EGLIBC),y) -PKG_DEPENDS+= eglibc-dev -PKG_BUILDDEP+= eglibc -endif -ifeq ($(ADK_TARGET_LIB_GLIBC),y) -PKG_DEPENDS+= glibc-dev -PKG_BUILDDEP+= glibc -endif - PKG_TARGET_DEPENDS:= !ag241 WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj -- cgit v1.2.3