Changeset 385b2e2 in rtems


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    ra0d2c79a r385b2e2  
     12003-02-18      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * automake/local.am: Introduce depend-gcc.
     4        Remove ${ARCH}.
     5        * automake/compile.am: Remove GCCSPECS, GCC_SPECS, CONFIG.CC, CC,
     6        CPP. Add ${ARCH}. depend-gcc.
     7        * aclocal/prog-cc.m4: Set up RTEMS_CPPFLAGS.
     8        * aclocal/env-rtemscpu.m4: Remove GCC_SPECS.
     9        * aclocal/env-rtemsbsp.m4: Remove GCC_SPECS.
     10
    1112003-02-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    212
  • cpukit/aclocal/env-rtemsbsp.m4

    ra0d2c79a r385b2e2  
    3535AC_SUBST(RTEMS_ROOT)
    3636
    37 GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
    38 AC_SUBST(GCC_SPECS)
    39 
    4037RTEMS_ENABLE_BARE
    4138AC_SUBST(BARE_CPU_MODEL)
  • cpukit/aclocal/env-rtemscpu.m4

    ra0d2c79a r385b2e2  
    1313    [MULTISUBDIR="/$with_multisubdir"])
    1414  AC_SUBST(MULTISUBDIR)
    15 
    16   GCC_SPECS="-isystem \$(PROJECT_INCLUDE)"
    17   AC_SUBST(GCC_SPECS)
    1815
    1916  PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include"
  • cpukit/aclocal/prog-cc.m4

    ra0d2c79a r385b2e2  
    3636RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall"
    3737m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
     38RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"
     39else
     40RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
    3841fi
     42AC_SUBST(RTEMS_CPPFLAGS)
    3943])
  • cpukit/automake/compile.am

    ra0d2c79a r385b2e2  
    4141## cf. make.info ("Implicit rules/variables" for details)
    4242
    43 if RTEMS_USE_GCC
    44 ## All the stuff below is specific to gcc
    45 ## gcc >= 2.8.x
    46 GCCSPECS = $(GCC_SPECS)
    47 else
    48 ## fall back to the old style compilers/*.cfg
    49 ## CONFIG.CC is supposed to be provided by <BSP>.cfg
    50 include $(CONFIG.CC)
    51 endif # RTEMS_USE_GCC
    52 
    5343DEFS = @DEFS@
    5444
     
    8878#
    8979
     80if RTEMS_USE_GCC
    9081## HACK: Specific to gcc
    9182## FIXME: The approach below is known to be conceptionally broken.
    92 depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
     83depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
    9384##       Use gcc -M to generate dependencies
    9485##       Replace foo.$(OBJEXT) with $(ARCH)/foo.$(OBJEXT)
     
    9990            -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
    10091        mv $(DEPEND).tmp $(DEPEND)
    101 depend: depend-am
    10292
    10393# pull in dependencies if they exist 
     
    10595include ${DEPEND}
    10696@ENDIF@
     97endif
     98depend: depend-gcc
    10799
    108100## -------------------------------------------------------------------------
     
    127119ARCH__V = $(ARCH_OPTIMIZE_V)
    128120ARCH = $(ARCH_$(VARIANT_V)_V)
     121
     122${ARCH}:
     123        mkdir ${ARCH}
    129124
    130125## Setup the library suffix
     
    159154
    160155## -------------------------------------------------------------------------
    161 
    162 CC = @CC@ $(GCCSPECS)
    163 CPP = @CPP@ $(GCCSPECS)
    164 
    165 ##
    166156AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
    167157AM_CFLAGS =
  • cpukit/automake/local.am

    ra0d2c79a r385b2e2  
    2121.PHONY: preinstall preinstall-am
    2222
    23 depend-am:
     23depend-am: depend-gcc
    2424depend: depend-am
    25 .PHONY: depend depend-am
    26 
    27 ${ARCH}:
    28         mkdir ${ARCH}
     25.PHONY: depend depend-am depend-gcc
    2926
    3027clean-local:
Note: See TracChangeset for help on using the changeset viewer.