summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-03-04 18:32:15 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-03-04 18:32:15 +0000
commit86c2108d92fc3a518ae698c1b4de2713e557da0e (patch)
treeb4a8745c19848c4bc549055df06626f818f34af7 /Makefile.am
parentc34f2b2ba77b263e85a42ea204660e5c2633e3be (diff)
downloadrtems-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.am17
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