Browse Source

rework build dependencies

Waldemar Brodkorb 15 years ago
parent
commit
18aec5b03e
2 changed files with 11 additions and 21 deletions
  1. 11 8
      package/Makefile
  2. 0 13
      package/gcc/Makefile

+ 11 - 8
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)

+ 0 - 13
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