Changeset 4619da9 in rtems


Ignore:
Timestamp:
May 1, 2002, 11:11:05 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
907ef1f6
Parents:
51b39864
Message:

2002-04-24 Ralf Corsepius <corsepiu@…>

  • custom/Makefile.am: Remove.
  • compilers/Makefile.am: Remove.
  • compilers/.cvsignore: Remove.
  • Makefile.am: Merge-in former */Makefile.ams. Add more vars to <BSP>.cache.
  • configure.ac: Reflect changes above. Cosmetic fixes.
Location:
c/src/make
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/make/ChangeLog

    r51b39864 r4619da9  
     12002-04-24      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * custom/Makefile.am: Remove.
     4        * compilers/Makefile.am: Remove.
     5        * compilers/.cvsignore: Remove.
     6        * Makefile.am: Merge-in former */Makefile.ams.
     7        Add more vars  to <BSP>.cache.
     8        * configure.ac: Reflect changes above. Cosmetic fixes.
     9
    1102002-04-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    211
  • c/src/make/Makefile.am

    r51b39864 r4619da9  
    44
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
     6
     7include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    68
    79rtems_makedir = $(prefix)/make
     
    1416
    1517noinst_DATA = leaf.cfg
     18EXTRA_DIST = leaf.cfg
    1619
    1720rtemsdir = $(exec_prefix)
     
    2528$(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in
    2629        cp $< $@
    27 
    2830endif
    2931
    30 SUBDIRS = compilers custom
    31 
    32 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    33 
    3432@RTEMS_BSP@.cache: Makefile
    35         $(RM) $@
     33        @$(RM) $@
    3634        @echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
    3735        @echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
    38 
     36        @echo rtems_cv_RTEMS_BSP_CFLAGS=\$${rtems_cv_RTEMS_BSP_CFLAGS=$(CPU_CFLAGS)} >> $@
     37        @echo rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_OPTIMIZE_V=$(CFLAGS_OPTIMIZE_V)} >> $@
     38        @echo rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_DEBUG_V=$(CFLAGS_DEBUG_V)} >> $@
     39        @echo rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V=\$${rtems_cv_RTEMS_BSP_CFLAGS_PROFILE_V=$(CFLAGS_PROFILE_V)} >> $@
     40noinst_DATA += @RTEMS_BSP@.cache
    3941DISTCLEANFILES = @RTEMS_BSP@.cache
    4042
    41 EXTRA_DIST = leaf.cfg
     43rtems_make_compilersdir = $(rtems_makedir)/compilers
    4244
    43 include $(top_srcdir)/../../../automake/subdirs.am
     45## At the moment all actively supported configurations
     46## use gcc-target-default.cfg only.
     47dist_rtems_make_compilers_DATA = compilers/gcc-target-default.cfg
     48
     49rtems_make_customdir = $(rtems_makedir)/custom
     50rtems_make_custom_DATA = @CUSTOM_CFG_FILES@
     51
     52noinst_DATA += custom/default.cfg
     53DISTCLEANFILES += custom/default.cfg
     54
    4455include $(top_srcdir)/../../../automake/local.am
  • c/src/make/configure.ac

    r51b39864 r4619da9  
    9393  if test -r "${srcdir}/${cfg_dir}/custom/$f"; then
    9494    AC_CONFIG_LINKS([custom/$f:${cfg_dir}/custom/$f])
    95     CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES $f"
     95    CUSTOM_CFG_FILES="$CUSTOM_CFG_FILES custom/$f"
    9696    f=`grep "^include.*make/custom" ${srcdir}/${cfg_dir}/custom/$f \
    9797    | sed \
     
    119119  RTEMS_TOPdir=${RTEMS_TOPdir}
    120120  cfg_dir=${cfg_dir}
    121   test -d Templates || mkdir Templates
    122121])
    123122
     
    127126host.cfg
    128127bsp.cfg
    129 custom/Makefile
    130128custom/default.cfg
    131 compilers/Makefile])
    132 AC_CONFIG_COMMANDS([default],[[${MAKE} $RTEMS_BSP.cache]],[[MAKE=${MAKE-make}
    133 RTEMS_BSP=${RTEMS_BSP}
     129])
     130
     131AC_CONFIG_COMMANDS([default],
     132[[${MAKE} $RTEMS_BSP.cache
     133]],
     134[[MAKE=${MAKE-make}
     135  RTEMS_BSP=${RTEMS_BSP}
    134136]])
     137
    135138AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.