From 7dcbbfbbd8dee79aaa1e5237ed8a09e819eb3491 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 2 Jun 2007 09:05:40 +0000 Subject: [PATCH] - move setting up the extensions to correct place (like i said but tom didn't do..) --- Makefile | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index d58b693db2..d809563197 100644 --- a/Makefile +++ b/Makefile @@ -45,43 +45,28 @@ ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y) cc-option = $(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) -############################################################# -# -# The list of stuff to build for the target toolchain -# along with the packages to build for the target. -# -############################################################## -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -TARGETS:=uclibc-configured binutils gcc uclibc-target-utils -else -TARGETS:=uclibc -endif -include toolchain/Makefile.in -include package/Makefile.in ############################################################# # -# You should probably leave this stuff alone unless you know -# what you are doing. +# Setup the proper filename extensions for the target # -############################################################# - -ifneq (,$(findstring linux,$(BR2_GNU_BUILD_SUFFIX))) +############################################################## +ifneq ($(findstring linux,$(BR2_GNU_BUILD_SUFFIX)),) EXEEXT:= LIBEXT:=.a SHREXT:=.so endif -ifneq (,$(findstring apple,$(BR2_GNU_BUILD_SUFFIX))) +ifneq ($(findstring apple,$(BR2_GNU_BUILD_SUFFIX)),) EXEEXT:= LIBEXT:=.a SHREXT:=.dylib endif -ifneq (,$(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX))) +ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),) EXEEXT:=.exe LIBEXT:=.lib SHREXT:=.dll endif -ifneq (,$(findstring mingw,$(BR2_GNU_BUILD_SUFFIX))) +ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),) EXEEXT:=.exe LIBEXT:=.lib SHREXT:=.dll @@ -93,6 +78,29 @@ else LIBTGTEXT=$(SHREXT) endif + + +############################################################# +# +# The list of stuff to build for the target toolchain +# along with the packages to build for the target. +# +############################################################## +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +TARGETS:=uclibc-configured binutils gcc uclibc-target-utils +else +TARGETS:=uclibc +endif +include toolchain/Makefile.in +include package/Makefile.in + +############################################################# +# +# You should probably leave this stuff alone unless you know +# what you are doing. +# +############################################################# + all: world # In this section, we need .config -- 2.30.2