summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-02-17 13:50:24 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-02-17 13:50:24 +0000
commit9078e0974be224b6961ec2b5e415d495f3551c95 (patch)
treefa938a2762a6a0f1a4c89643c40bf00c497a631a
parent1204f225cba8b68baceaca645e338853dc0a8fba (diff)
downloadrtems-9078e0974be224b6961ec2b5e415d495f3551c95.tar.bz2
2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: DIST_SUBDIRS = $(SUBDIRS). Rework dist-hook. * configure.ac: Reflect changes to RTEMS_ENABLE_RTEMSBSP. * aclocal/enable-rtemsbsp.m4: Add support for --disable-rtemsbsp.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am22
-rw-r--r--aclocal/enable-rtemsbsp.m49
-rw-r--r--configure.ac2
4 files changed, 26 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 06c90d3d71..fcead95025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: DIST_SUBDIRS = $(SUBDIRS).
+ Rework dist-hook.
+ * configure.ac: Reflect changes to RTEMS_ENABLE_RTEMSBSP.
+ * aclocal/enable-rtemsbsp.m4: Add support for --disable-rtemsbsp.
+
2004-02-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: RTEMS_BUILD_CONFIG_SUBDIRS([testsuites/tools]).
diff --git a/Makefile.am b/Makefile.am
index 13faa3cc90..ed478fd582 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@
ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS)
ACLOCAL_FILES =
ACLOCAL_FILES += aclocal/bsp-alias.m4
@@ -27,16 +28,19 @@ EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS)
EXTRA_DIST += $(ACLOCAL_FILES)
EXTRA_DIST += config-ml.in
-DIST_SUBDIRS = make
+
dist-hook:
- cp -pR $(srcdir)/doc $(distdir)/doc
- find $(distdir)/doc -name '*.t' -print | while read a; do \
- if test -f $${a}exi; then echo "rm $${a}exi"; rm -f $${a}exi; fi; done
- cp -pR $(srcdir)/tools $(distdir)/tools
- cp -pR $(srcdir)/c $(distdir)/c
- cp -pR $(srcdir)/cpukit $(distdir)/cpukit
- cp -pR $(srcdir)/testsuites $(distdir)/testsuites
- cp -pR $(srcdir)/scripts $(distdir)/scripts
+ @files=`(cd $(srcdir); find doc cpukit c scripts testsuites tools \
+ -name configure.ac -print | sed 's,/configure.ac,,' | sort)`; \
+ for i in $$files; do \
+ if test -f $(distdir)/$$i/configure.ac; then : ; \
+ else \
+ d=`dirname $(distdir)/$$i`; \
+ $(mkdir_p) $$d;\
+ echo "cp -pR $(srcdir)/$$i $(distdir)/$$i"; \
+ cp -pR $(srcdir)/$$i $(distdir)/$$i; \
+ fi; \
+ done
rm -f $(distdir)/scripts/setup.cache
rm -f $(distdir)/scripts/*/*.spec
rm -rf `find $(distdir) -name 'autom4te*'`
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index 2bf0310ade..d0f0d0cb9c 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -9,8 +9,9 @@ AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])
AC_ARG_ENABLE(rtemsbsp,
[AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
[BSPs to include in build])],
-[case "${enableval}" in
- yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp="bsp1 bsp2"]);;
- *) $1=$enableval;;
-esac],[$1=""])
+[case "${enable_rtemsbsp}" in
+ yes ) enable_rtemsbsp="" ;;
+ no ) enable_rtemsbsp="no" ;;
+ *) enable_rtemsbsp="$enable_rtemsbsp" ;;
+esac],[enable_rtemsbsp=""])
])
diff --git a/configure.ac b/configure.ac
index e02e1f3b7c..f099ecdeaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ RTEMS_ENABLE_INLINES
RTEMS_ENABLE_CXX
RTEMS_ENABLE_TESTS
RTEMS_ENABLE_RTEMS_DEBUG
-RTEMS_ENABLE_RTEMSBSP(dummy)
+RTEMS_ENABLE_RTEMSBSP
RTEMS_ENABLE_MULTILIB
AC_ARG_ENABLE([docs],