Changeset 86c2108d in rtems


Ignore:
Timestamp:
Mar 4, 2011, 6:32:15 PM (9 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.11, master
Children:
e783d04
Parents:
c34f2b2b
Message:

2011-03-04 Ralf Corsépius <ralf.corsepius@…>

  • Makefile.am: Merge-in make/Makefile.am.
  • configure.ac: Reflect change above.
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rc34f2b2b r86c2108d  
     12011-03-04      Ralf Corsépius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Merge-in make/Makefile.am.
     4        * configure.ac: Reflect change above.
     5
    162011-03-04      Ralf Corsépius <ralf.corsepius@rtems.org>
    27
  • Makefile.am

    rc34f2b2b r86c2108d  
    88ACLOCAL_AMFLAGS = -I aclocal
    99
    10 SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
     10SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
    1111DIST_SUBDIRS = $(SUBDIRS)
    1212
     
    4141          if test -f $$f; then echo "rm $$f"; rm $$f; fi; done
    4242
     43rtems_makedir = $(prefix)/make
     44
     45dist_rtems_make_DATA = make/main.cfg make/leaf.cfg
     46
     47EXTRA_DIST += make/host.cfg.in
     48
     49rtems_make_Templatesdir = $(rtems_makedir)/Templates
     50
     51dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \
     52    make/Templates/Makefile.leaf make/Templates/Makefile.lib
     53
     54rtems_make_customdir = $(rtems_makedir)/custom
     55
     56dist_rtems_make_custom_DATA = make/custom/default.cfg
     57
    4358include $(top_srcdir)/automake/subdirs.am
    4459include $(top_srcdir)/automake/host.am
  • configure.ac

    rc34f2b2b r86c2108d  
    6868RTEMS_TARGET_CONFIG_SUBDIRS([c])
    6969
    70 AC_CONFIG_FILES([Makefile
    71 make/Makefile
    72 ])
     70AC_CONFIG_FILES([Makefile])
    7371
    7472AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.