Changeset a42f159a in rtems


Ignore:
Timestamp:
Jan 11, 2004, 5:25:27 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
f08808e
Parents:
4055a9c0
Message:

2004-01-11 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Remove AUTOMAKE_FILES.
  • automake/compile.am: Replace contents with contents of automake/amcompile.am.
  • automake/amcompile.am, automake/lib.am: Remove.
Location:
cpukit
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r4055a9c0 ra42f159a  
     12004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Remove AUTOMAKE_FILES.
     4        * automake/compile.am: Replace contents with contents of
     5        automake/amcompile.am.
     6        * automake/amcompile.am, automake/lib.am: Remove.
     7
    182004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • cpukit/Makefile.am

    r4055a9c0 ra42f159a  
    2424    include/rtems/fs.h include/rtems/stdint.h
    2525
    26 AUTOMAKE_FILES = automake/compile.am automake/lib.am automake/local.am \
    27     automake/multilib.am automake/subdirs.am
    28 EXTRA_DIST = $(AUTOMAKE_FILES)
    29 
    3026PREINSTALL_FILES =
    3127
  • cpukit/automake/compile.am

    r4055a9c0 ra42f159a  
    2525## RTEMS_USE_GCC     .. if we are using GCC
    2626
    27 ## NOTES:
    28 ## * The gcc-2.8 building scheme is the nominal building scheme and
    29 ##   is actively supported.
    30 ## * The non-gcc building scheme requires manually setting up environment
    31 ##   variables and is hardly tested at all
    32 
    3327## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
    3428## would want the corresponding macros to be set to.
     
    3731## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
    3832
    39 ## XCPPFLAGS, XCFLAGS, XASFLAGS
    40 ## are used to add flags from the shell
    41 ## cf. make.info ("Implicit rules/variables" for details)
     33CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
     34CFLAGS   = @RTEMS_CFLAGS@
     35ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS)
    4236
    43 DEFS = @DEFS@
    44 
    45 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
    46 CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
    47 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
    48 
    49 #
    50 # How to compile stuff into ${ARCH} subdirectory
    51 #
    52 
    53 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    54         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    55 CCLD = $(CC)
    56 
    57 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
    58 
    59 ${ARCH}/%.$(OBJEXT): %.c $(ARCH)/$(dirstamp)
    60         ${COMPILE} -o $@ -c $<
    61 
    62 ${ARCH}/%.$(OBJEXT): %.S $(ARCH)/$(dirstamp)
    63         ${CCASCOMPILE} -o $@ -c $<
    64 
    65 # Make foo.rel from foo.$(OBJEXT)
    66 ${ARCH}/%.rel: ${ARCH}/%.$(OBJEXT)
    67         ${make-rel}
    68 
    69 # Dependency files for use by gmake
    70 # NOTE: we don't put them into $(ARCH)
    71 #       so that 'make clean' doesn't blow it away
    72 
    73 DEPEND=Depends-${ARCH}
    74 
    75 # We deliberately don't have anything depend on the
    76 # $(DEPEND) file; otherwise it will get rebuilt even
    77 # on 'make clean'
    78 #
    79 
    80 if RTEMS_USE_GCC
    81 ## HACK: Specific to gcc
    82 ## FIXME: The approach below is known to be conceptionally broken.
    83 depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
    84 ##       Use gcc -M to generate dependencies
    85 ##       Replace foo.$(OBJEXT) with $(ARCH)/foo.$(OBJEXT)
    86 ##       Replace $(ARCH) value with string $(ARCH)
    87 ##           so that it will for debug cases
    88         $(COMPILE) -M   $^    |  \
    89         sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
    90             -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
    91         mv $(DEPEND).tmp $(DEPEND)
    92 
    93 # pull in dependencies if they exist 
    94 ifeq (${DEPEND},$(wildcard ${DEPEND}))
    95 include ${DEPEND}
    96 @ENDIF@
    97 endif
    98 depend: depend-gcc
     37depend:
    9938
    10039## -------------------------------------------------------------------------
     
    10948
    11049VARIANT_V = $(VARIANT_$(VARIANT)_V)
    111 
    112 ## Setup the variant build subdirectory
    113 ARCH_OPTIMIZE_V = o-optimize
    114 ARCH_DEBUG_V = o-debug
    115 
    116 ARCH__V = $(ARCH_OPTIMIZE_V)
    117 ARCH = $(ARCH_$(VARIANT_V)_V)
    118 
    119 ${ARCH}/$(dirstamp):
    120         @$(mkdir_p) $(ARCH)
    121         @: > $(ARCH)/$(dirstamp)
    12250
    12351## Setup the library suffix
Note: See TracChangeset for help on using the changeset viewer.