Changeset 1cd9dfc in rtems for automake


Ignore:
Timestamp:
May 16, 2003, 9:11:40 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
4567d3ce
Parents:
03bd4ae
Message:

2003-05-16 Ralf Corsepius <corsepiu@…>

  • aclocal/check-cxx.m4: Remove LIBSUFFIX_VA.
  • automake/compile.am: Remove LIBSUFFIX_VA. Merger from rtems-4-6-branch.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • automake/compile.am

    r03bd4ae r1cd9dfc  
    5656CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
    5757CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
    58 CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
     58## FIXME: This should be correct, but is not supported, yet
     59# CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
     60## Fall back to using RTEMS_CFLAGS for C++
     61CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS)
    5962ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
    6063
     
    108111#
    109112
     113if RTEMS_USE_GCC
    110114## HACK: Specific to gcc
    111115## FIXME: The approach below is known to be conceptionally broken.
    112 depend-am: $(C_FILES) $(CC_FILES) $(S_FILES)
     116depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
    113117##       Use gcc -M to generate dependencies
    114118##       Replace foo.o with $(ARCH)/foo.o
     
    119123            -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
    120124        mv $(DEPEND).tmp $(DEPEND)
    121 depend: depend-am
    122125
    123126# pull in dependencies if they exist 
     
    125128include ${DEPEND}
    126129@ENDIF@
    127 
     130endif
     131depend: depend-am
    128132
    129133# spell out all the LINK_FILE's, rather than using -lbsp, so
     
    180184
    181185LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
    182 LIBSUFFIX_VA = $(LIB_VARIANT).a
    183186
    184187## These are supposed to be set in make/custom/<bsp>.cfg
     
    220223AM_CXXFLAGS =
    221224AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
     225
     226${ARCH}:
     227        mkdir ${ARCH}
     228
     229clean-local:
     230        $(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
     231        $(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
Note: See TracChangeset for help on using the changeset viewer.