Changeset a34b245 in rtems for automake


Ignore:
Timestamp:
Oct 29, 2001, 2:39:50 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
6a91771a
Parents:
c1368b9
Message:

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

  • Adopt more automake rules:
  • automake/compile.am: Add LINK, CXXLINK, AS, ASCOMPILE; Remove ARFLAGS, LINK.c, COMPILE.S, LINK.cc; Add CPU_CFLAGS to CXXFLAGS, CFLAGS, ASFLAGS;
  • automake/leaf.am: Add CXXLINK_APP, LINK_APP, make-exe, apply CXXLINK_APP in make-cxx-exe.
  • automake/lib.am: Add ARFLAGS.
Location:
automake
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • automake/compile.am

    rc1368b9 ra34b245  
    7676DEFS = @DEFS@
    7777
    78 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \
     78CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
    7979   $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
    80 CFLAGS   = $(CFLAGS_DEFAULT) $(XCFLAGS)
    81 CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS)
    82 ASFLAGS  = $(CPU_ASFLAGS) $(XASFLAGS)
     80CFLAGS   = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
     81CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
     82ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
    8383
    8484LINK_LIBS = $(LINK_LIBS_GCC272) $(LD_LIBS)
     
    109109#
    110110
    111 ARFLAGS=ruv
    112 
    113111#
    114112# How to compile stuff into ${ARCH} subdirectory
     
    117115COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    118116        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    119 
     117CCLD = $(CC)
     118LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     119        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     120
     121CXXLD = $(CXX)
    120122CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    121123        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     124CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
     125        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     126
     127AS = $(CC)
     128ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -o $@
    122129
    123130${ARCH}/%.o: %.c
     
    137144
    138145${ARCH}/%.o: %.S
    139         ${COMPILE.S} $(AM_CPPFLAGS) -DASM -o $@ $<
     146        ${ASCOMPILE} -DASM -c $<
    140147
    141148# Make foo.rel from foo.o
     
    198205if RTEMS_USE_GCC272
    199206define make-rel
    200         $(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^
     207        $(LINK) -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
    201208endef
    202209else
    203210## gcc >= 2.8
    204211define make-rel
    205         $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
    206           -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
     212        $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^
    207213endef
    208214endif
     
    210216## non-gcc
    211217define make-rel
    212         $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
    213           $(XLDFLAGS) -o $@ $^
     218        $(LINK) $(XLDFLAGS) $^
    214219endef
    215220endif
  • automake/leaf.am

    rc1368b9 ra34b245  
    11include $(RTEMS_ROOT)/make/leaf.cfg
    22
     3CXXLINK_APP = $(CXXLINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS)
    34ifndef make-cxx-exe
    45define make-cxx-exe
    5         $(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) \
    6         $(LDLIBS) -o $@ \
    7         $(LINK_OBJS) $(LINK_LIBS)
     6        $(CXXLINK_APP)
    87endef
    98@ENDIF@
     9
     10LINK_APP = $(LINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS)
     11ifndef make-exe
     12define make-exe
     13        $(LINK_APP)
     14endef
     15@ENDIF@
     16
  • automake/lib.am

    rc1368b9 ra34b245  
    66AR = @AR@
    77RANLIB = @RANLIB@
     8
     9ARFLAGS = ruv
    810
    911define make-library
Note: See TracChangeset for help on using the changeset viewer.