diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-19 14:34:59 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-19 14:34:59 +0000 |
| commit | 9201e6bdaf03e4a060dc7d93934d5a70515dd845 (patch) | |
| tree | 97383a9c3545b5986f45213ebdbfc7f9de8ddac9 | |
| parent | 2001-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-9201e6bdaf03e4a060dc7d93934d5a70515dd845.tar.bz2 | |
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* optman/Makefile.am: Add multilib support. Remove ASM4FLAGS.
* src/Makefile.am: Add multilib support.
| -rw-r--r-- | c/src/exec/posix/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/exec/posix/optman/Makefile.am | 9 | ||||
| -rw-r--r-- | c/src/exec/posix/src/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/posix/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/posix/src/Makefile.am | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog index ca0b4623c9..1d07d15574 100644 --- a/c/src/exec/posix/ChangeLog +++ b/c/src/exec/posix/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * optman/Makefile.am: Add multilib support. Remove ASM4FLAGS. + * src/Makefile.am: Add multilib support. + 2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * include/sys/Makefile.am: Remove. diff --git a/c/src/exec/posix/optman/Makefile.am b/c/src/exec/posix/optman/Makefile.am index 0b038daaf8..b508a8cc35 100644 --- a/c/src/exec/posix/optman/Makefile.am +++ b/c/src/exec/posix/optman/Makefile.am @@ -9,17 +9,14 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) -## FIXME: Is this used anywhere? -ASM4FLAGS = -I$(PROJECT_INCLUDE)/rtems - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +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/%$(LIB_VARIANT).rel) + $(C_FILES:%.c=$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel) -$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel +$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel: $(ARCH)/%.rel $(INSTALL_DATA) $< $@ # diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am index daffbe6c3b..ea200387d6 100644 --- a/c/src/exec/posix/src/Makefile.am +++ b/c/src/exec/posix/src/Makefile.am @@ -87,7 +87,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../automake/multilib.am include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog index ca0b4623c9..1d07d15574 100644 --- a/cpukit/posix/ChangeLog +++ b/cpukit/posix/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * optman/Makefile.am: Add multilib support. Remove ASM4FLAGS. + * src/Makefile.am: Add multilib support. + 2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * include/sys/Makefile.am: Remove. diff --git a/cpukit/posix/src/Makefile.am b/cpukit/posix/src/Makefile.am index daffbe6c3b..ea200387d6 100644 --- a/cpukit/posix/src/Makefile.am +++ b/cpukit/posix/src/Makefile.am @@ -87,7 +87,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) OBJS = $(C_O_FILES) -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../automake/multilib.am include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am |