summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-06-30 06:22:31 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-06-30 06:22:31 +0000
commit48e7a7181cbcdef94681aa68222e49ad78de2976 (patch)
treecee67d5ac52a750c9b6aff70d2b98214863f054d
parent2002-06-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-48e7a7181cbcdef94681aa68222e49ad78de2976.tar.bz2
2002-06-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/multilib.am: Remove. * Makefile.am: Reflect change above.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--automake/multilib.am33
3 files changed, 6 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 0994f4022f..6773216de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * automake/multilib.am: Remove.
+ * Makefile.am: Reflect change above.
+
2002-06-28 Joel Sherrill <joel@OARcorp.com>
* aclocal/version.m4: Updated to rtems-ss-20020628.
diff --git a/Makefile.am b/Makefile.am
index d6e89eec74..63941bb3a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
- automake/local.am automake/multilib.am automake/subdirs.am \
+ automake/local.am automake/subdirs.am \
automake/leaf.am automake/force-preinstall.am
ACLOCAL_FILES = aclocal/bsp-alias.m4 aclocal/canonical-host.m4 \
diff --git a/automake/multilib.am b/automake/multilib.am
deleted file mode 100644
index 37a6086616..0000000000
--- a/automake/multilib.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## $Id$
-
-if MULTILIB
-MULTISRCTOP =
-MULTIDIRS =
-MULTIDO = true
-MULTICLEAN = true
-endif
-
-# Multilib support rules
-.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
- maintainer-clean-multi
-
-if MULTILIB
-all-recursive: all-multi
-mostlyclean-recursive: mostlyclean-multi
-clean-recursive: clean-multi
-distclean-recursive: distclean-multi
-maintainer-clean-recursive: maintainer-clean-multi
-
-all-multi:
- $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
-mostlyclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
-distclean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
-maintainer-clean-multi:
- $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
-else
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-endif