summaryrefslogtreecommitdiffstats
path: root/automake
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:20:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:20:00 +0000
commit3174a7edaefd2d1f59af44c7f6856c69327ecf9d (patch)
tree101990c9e3421b7d76dd2a0962442005b357efab /automake
parent846027b9b8e2d1a645681f9c0a5f3e75a02422df (diff)
downloadrtems-3174a7edaefd2d1f59af44c7f6856c69327ecf9d.tar.bz2
2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: New, Cygnus/GNU style configuration. * Makefile.am: Add macros/, reflect new configure.in, ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros * automake/compile.am: BSP_SPECS, remove RTEMS_CANONICALIZATION. * automake/lib.am: Remove RTEMS_CANONICALIZATION. * macros/tool-prefix.m4: Remove. * macros/target.m4: Remove RTEMS_CONFIG_SUBDIRS, RTEMS_OUTPUT_SUBDIRS. * macros/enable-rtemsbsp.m4: Add RTEMS_CONFIG_PER_BSP, add setting RTEMS_ROOT. * macros/i386-gas-code16.m4: Define NEW_GAS only for 16bit mode- * macros/multilib.m4: Various minor fixes. * macros/project-root.m4: Remove setting PROJECT_TOPdir, PROJECT_ROOT, RTEMS_ROOT. * macros/rtems-top.m4: Remove RTEMS_CANONICALIZATION, TARGET_SUBDIRS; Add with_target_subdirs, PROJECT_TOPdir, PROJECT_ROOT.
Diffstat (limited to 'automake')
-rw-r--r--automake/compile.am31
-rw-r--r--automake/lib.am3
2 files changed, 5 insertions, 29 deletions
diff --git a/automake/compile.am b/automake/compile.am
index 938722f277..5090ce0eee 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -64,8 +64,11 @@ LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
LINK_LIBS_GCC272 = $(LINK_LIBS_RTEMS) $(LIBC_LIBC) $(LIBC_LIBGCC)
else
## gcc >= 2.8.x
-## FIXME: This is BSP-specific and will fail for BSP-independent directories
-GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
+if RTEMS_CONFIG_PER_BSP
+BSP_SPECS = -specs bsp_specs -qrtems
+endif
+
+GCCSPECS = -B$(PROJECT_RELEASE)/lib/ $(BSP_SPECS)
endif
else
## fall back to the old style compilers/*.cfg
@@ -273,36 +276,12 @@ RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
## -------------------------------------------------------------------------
-## FIXME: This will probably vanish, when GNU canonicalization will be
-## introduced
-if RTEMS_CANONICALIZATION
-
-CC = $(CC_FOR_TARGET) $(GCCSPECS)
-CXX = $(CXX_FOR_TARGET) $(GCCSPECS)
-AR_FOR_TARGET = @AR_FOR_TARGET@
-AR = $(AR_FOR_TARGET)
-AS_FOR_TARGET = @AS_FOR_TARGET@
-AS = $(AS_FOR_TARGET)
-RANLIB_FOR_TARGET = @RANLIB_FOR_TARGET@
-RANLIB = $(RANLIB_FOR_TARGET)
-LD_FOR_TARGET = @LD_FOR_TARGET@
-LD = $(LD_FOR_TARGET)
-NM_FOR_TARGET = @NM_FOR_TARGET@
-NM = $(NM_FOR_TARGET)
-OBJCOPY_FOR_TARGET = @OBJCOPY_FOR_TARGET@
-OBJCOPY = $(OBJCOPY_FOR_TARGET)
-SIZE_FOR_TARGET = @SIZE_FOR_TARGET@
-SIZE = $(SIZE_FOR_TARGET)
-STRIP_FOR_TARGET = @STRIP_FOR_TARGET@
-STRIP = $(STRIP_FOR_TARGET)
-else
CC = @CC@ $(GCCSPECS)
CXX = @CXX@ $(GCCSPECS)
OBJCOPY = @OBJCOPY@
NM = @NM@
SIZE = @SIZE@
STRIP = @STRIP@
-endif
##
## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS
diff --git a/automake/lib.am b/automake/lib.am
index 8fe1af1e03..0bab98fa5b 100644
--- a/automake/lib.am
+++ b/automake/lib.am
@@ -2,11 +2,8 @@
## $Id$
##
-if RTEMS_CANONICALIZATION
-else
AR = @AR@
RANLIB = @RANLIB@
-endif
define make-library
$(RM) $@