diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-04 18:32:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-04 18:32:15 +0000 |
| commit | 86c2108d92fc3a518ae698c1b4de2713e557da0e (patch) | |
| tree | b4a8745c19848c4bc549055df06626f818f34af7 /Makefile.am | |
| parent | 2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-86c2108d92fc3a518ae698c1b4de2713e557da0e.tar.bz2 | |
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Merge-in make/Makefile.am.
* configure.ac: Reflect change above.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 16 insertions, 1 deletions
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 |