diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-15 08:20:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-06-15 08:20:55 +0000 |
| commit | dfa9b5fcfd6d16d9de459096acdf8701e460b53b (patch) | |
| tree | fe5855b9169f45fe4ffea30b6dec1fbea489f3d1 | |
| parent | 2002-06-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-dfa9b5fcfd6d16d9de459096acdf8701e460b53b.tar.bz2 | |
2002-06-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove multilib support.
* configure.ac: Ditto.
* sapi/Makefile.am: Ditto.
| -rw-r--r-- | c/src/optman/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/optman/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/optman/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/optman/sapi/Makefile.am | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog index c03315b64d..243348898b 100644 --- a/c/src/optman/ChangeLog +++ b/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. diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am index 545c41ccf0..4758d16a75 100644 --- a/c/src/optman/Makefile.am +++ b/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 diff --git a/c/src/optman/configure.ac b/c/src/optman/configure.ac index 1a41b91891..d41bbaed3c 100644 --- a/c/src/optman/configure.ac +++ b/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 diff --git a/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am index 055706bbe8..1c27ae4bfc 100644 --- a/c/src/optman/sapi/Makefile.am +++ b/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) $< $@ |