Changeset bfba54e in rtems for automake


Ignore:
Timestamp:
Oct 10, 2001, 12:22:21 AM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
949b619
Parents:
221c8f3
Message:

2001-10-09 Ralf Corsepius <corsepiu@…>

  • automake/compile.am: Fundamentally reworked compilation rules for closer adaptation to automake's behavior.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • automake/compile.am

    r221c8f3 rbfba54e  
    7676DEFS = @DEFS@
    7777
    78 CPPFLAGS += @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
     78CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
    7979   $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
    8080CFLAGS   = $(CFLAGS_DEFAULT) $(XCFLAGS)
     
    115115#
    116116
     117COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     118        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     119
     120CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     121        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     122
    117123${ARCH}/%.o: %.c
    118         ${COMPILE.c} $(AM_CPPFLAGS) $(AM_CFLAGS) -o $@ $<
     124        ${COMPILE} -o $@ -c $<
    119125
    120126${ARCH}/%.o: %.cc
    121         ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
     127        ${CXXCOMPILE} -o $@ -c $<
    122128
    123129${ARCH}/%.o: %.cpp
    124         ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
     130        ${CXXCOMPILE} -o $@ -c $<
    125131
    126132${ARCH}/%.o: %.cxx
    127         ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
     133        ${CXXCOMPILE} -o $@ -c $<
    128134
    129135${ARCH}/%.o: %.C
    130         ${COMPILE.cc} $(AM_CPPFLAGS) $(AM_CXXFLAGS) -o $@ $<
     136        ${CXXCOMPILE} -o $@ -c $<
    131137
    132138${ARCH}/%.o: %.S
     
    164170##       Replace $(ARCH) value with string $(ARCH)
    165171##           so that it will for debug and profile cases
    166         $(COMPILE.c) $(AM_CPPFLAGS) $(AM_CFLAGS) -M   $^    |  \
     172        $(COMPILE) $(AM_CPPFLAGS) $(AM_CFLAGS) -M   $^    |  \
    167173        sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
    168174            -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
     
    278284STRIP = @STRIP@
    279285
    280 ##
    281 ## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS
    282 AM_CPPFLAGS += $(DEFS) $(INCLUDES) $(RTEMS_CPPFLAGS)
    283 
    284 AM_CFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
    285 AM_CXXFLAGS += $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
     286
     287##
     288AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
     289
     290AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
     291AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
Note: See TracChangeset for help on using the changeset viewer.