Changeset 385b2e2 in rtems

Timestamp:

Feb 18, 2003, 12:58:44 PM (18 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Children:

f7276a9b

Parents:

a0d2c79a

Message:

2003-02-18 Ralf Corsepius <corsepiu@…>

• automake/local.am: Introduce depend-gcc. Remove ${ARCH}.
• automake/compile.am: Remove GCCSPECS, GCC_SPECS, CONFIG.CC, CC, CPP. Add ${ARCH}. depend-gcc.
• aclocal/prog-cc.m4: Set up RTEMS_CPPFLAGS.
• aclocal/env-rtemscpu.m4: Remove GCC_SPECS.
• aclocal/env-rtemsbsp.m4: Remove GCC_SPECS.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• aclocal/env-rtemsbsp.m4 (modified) (1 diff)
• aclocal/env-rtemscpu.m4 (modified) (1 diff)
• aclocal/prog-cc.m4 (modified) (1 diff)
• automake/compile.am (modified) (6 diffs)
• automake/local.am (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+2003-02-18      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * automake/local.am: Introduce depend-gcc.
+        Remove ${ARCH}.
+        * automake/compile.am: Remove GCCSPECS, GCC_SPECS, CONFIG.CC, CC,
+        CPP. Add ${ARCH}. depend-gcc.
+        * aclocal/prog-cc.m4: Set up RTEMS_CPPFLAGS.
+        * aclocal/env-rtemscpu.m4: Remove GCC_SPECS.
+        * aclocal/env-rtemsbsp.m4: Remove GCC_SPECS.
+
 2003-02-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/aclocal/env-rtemsbsp.m4

@@ -35 +35 @@
 AC_SUBST(RTEMS_ROOT)
 
-GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
-AC_SUBST(GCC_SPECS)
-
 RTEMS_ENABLE_BARE
 AC_SUBST(BARE_CPU_MODEL)

cpukit/aclocal/env-rtemscpu.m4

@@ -13 +13 @@
     [MULTISUBDIR="/$with_multisubdir"])
   AC_SUBST(MULTISUBDIR)
-
-  GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
-  AC_SUBST(GCC_SPECS)
 
   PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"

cpukit/aclocal/prog-cc.m4

@@ -36 +36 @@
 RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
 m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
+RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"
+else
+RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
 fi
+AC_SUBST(RTEMS_CPPFLAGS)
 ])

cpukit/automake/compile.am

@@ -41 +41 @@
 ## cf. make.info ("Implicit rules/variables" for details)
 
-if RTEMS_USE_GCC
-## All the stuff below is specific to gcc
-## gcc >= 2.8.x
-GCCSPECS = $(GCC_SPECS)
-else
-## fall back to the old style compilers/*.cfg
-## CONFIG.CC is supposed to be provided by <BSP>.cfg
-include $(CONFIG.CC)
-endif # RTEMS_USE_GCC
-
 DEFS = @DEFS@
 
@@ -88 +78 @@
 #
 
+if RTEMS_USE_GCC
 ## HACK: Specific to gcc
 ## FIXME: The approach below is known to be conceptionally broken.
-depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
+depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
 ##       Use gcc -M to generate dependencies
 ##       Replace foo.$(OBJEXT) with $(ARCH)/foo.$(OBJEXT)
@@ -99 +90 @@
             -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
         mv $(DEPEND).tmp $(DEPEND)
-depend: depend-am
 
 # pull in dependencies if they exist  
@@ -105 +95 @@
 include ${DEPEND}
 @ENDIF@
+endif
+depend: depend-gcc
 
 ## -------------------------------------------------------------------------
@@ -127 +119 @@
 ARCH__V = $(ARCH_OPTIMIZE_V)
 ARCH = $(ARCH_$(VARIANT_V)_V)
+
+${ARCH}:
+        mkdir ${ARCH}
 
 ## Setup the library suffix
@@ -159 +154 @@
 
 ## -------------------------------------------------------------------------
-
-CC = @CC@ $(GCCSPECS)
-CPP = @CPP@ $(GCCSPECS)
-
-##
 AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
 AM_CFLAGS =

cpukit/automake/local.am

@@ -21 +21 @@
 .PHONY: preinstall preinstall-am
 
-depend-am:
+depend-am: depend-gcc
 depend: depend-am
-.PHONY: depend depend-am
-
-${ARCH}:
-        mkdir ${ARCH}
+.PHONY: depend depend-am depend-gcc
 
 clean-local: