diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 22 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.am: Merge-in make/Makefile.am. + * configure.ac: Reflect change above. + +2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org> + * Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4, aclocal/version.m4: Rename RTEMS_API into _RTEMS_API. diff --git a/Makefile.am b/Makefile.am index 72e314980d..215c865f94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I aclocal -SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS) +SUBDIRS = $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS) DIST_SUBDIRS = $(SUBDIRS) noinst_SCRIPTS = bootstrap @@ -40,5 +40,20 @@ dist-hook: f=`echo $$a | sed 's,\.in$$,,'`; \ if test -f $$f; then echo "rm $$f"; rm $$f; fi; done +rtems_makedir = $(prefix)/make + +dist_rtems_make_DATA = make/main.cfg make/leaf.cfg + +EXTRA_DIST += make/host.cfg.in + +rtems_make_Templatesdir = $(rtems_makedir)/Templates + +dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \ + make/Templates/Makefile.leaf make/Templates/Makefile.lib + +rtems_make_customdir = $(rtems_makedir)/custom + +dist_rtems_make_custom_DATA = make/custom/default.cfg + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/host.am diff --git a/configure.ac b/configure.ac index 7416d73e87..6acb037556 100644 --- a/configure.ac +++ b/configure.ac @@ -67,8 +67,6 @@ AS_IF([test x"$enable_multilib" = x"yes"],[ ]) RTEMS_TARGET_CONFIG_SUBDIRS([c]) -AC_CONFIG_FILES([Makefile -make/Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT |