2002-06-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Remove multilib support.
	* configure.ac: Ditto.
	* sapi/Makefile.am: Ditto.

c/src/optman/ChangeLog

@@ -1,3 +1,9 @@
+2002-06-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove multilib support.
+	* configure.ac: Ditto.
+	* sapi/Makefile.am: Ditto.
+
 2002-04-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove ENABLE_GCC28.

c/src/optman/Makefile.am

@@ -4,8 +4,6 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-include $(top_srcdir)/../../../automake/multilib.am
-
 SUBDIRS = rtems sapi
 
 include $(top_srcdir)/../../../automake/subdirs.am

c/src/optman/configure.ac

@@ -13,7 +13,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.6])
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_ITRON

c/src/optman/sapi/Makefile.am

@@ -11,12 +11,11 @@ PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
 ## FIXME: Is this used anywhere?
 ASM4FLAGS = -I$(PROJECT_INCLUDE)/rtems
 
-include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
 TMPINSTALL_FILES += \
-    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel)
+    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
 
 $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@