diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-19 14:35:14 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-19 14:35:14 +0000 |
commit | 624c881ae0ec2461efbc36cd87623fd4e2e9c23a (patch) | |
tree | 61fd9ccb269f167784e55e584428a82f8ef64669 | |
parent | 2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-624c881ae0ec2461efbc36cd87623fd4e2e9c23a.tar.bz2 |
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* optman/Makefile.am: Add multilib support.
* src/Makefile.am: Add multilib support.
Diffstat (limited to '')
-rw-r--r-- | c/src/exec/sapi/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/exec/sapi/optman/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/exec/sapi/src/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/optman/sapi/Makefile.am | 6 | ||||
-rw-r--r-- | cpukit/sapi/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/sapi/src/Makefile.am | 2 |
6 files changed, 18 insertions, 8 deletions
diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog index e64a906f1b..6209fdfd8f 100644 --- a/c/src/exec/sapi/ChangeLog +++ b/c/src/exec/sapi/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * optman/Makefile.am: Add multilib support. + * src/Makefile.am: Add multilib support. + 2001-10-16 Chris Johns <ccj@acm.org> * include/confdefs.h, include/rtems/config.h, include/rtems/io.h, diff --git a/c/src/exec/sapi/optman/Makefile.am b/c/src/exec/sapi/optman/Makefile.am index 514c97a132..2c12d729ec 100644 --- a/c/src/exec/sapi/optman/Makefile.am +++ b/c/src/exec/sapi/optman/Makefile.am @@ -12,14 +12,14 @@ 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/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am index b0bd6d78fe..d71c0e11f7 100644 --- a/c/src/exec/sapi/src/Makefile.am +++ b/c/src/exec/sapi/src/Makefile.am @@ -10,7 +10,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/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am index 514c97a132..2c12d729ec 100644 --- a/c/src/optman/sapi/Makefile.am +++ b/c/src/optman/sapi/Makefile.am @@ -12,14 +12,14 @@ 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/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog index e64a906f1b..6209fdfd8f 100644 --- a/cpukit/sapi/ChangeLog +++ b/cpukit/sapi/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * optman/Makefile.am: Add multilib support. + * src/Makefile.am: Add multilib support. + 2001-10-16 Chris Johns <ccj@acm.org> * include/confdefs.h, include/rtems/config.h, include/rtems/io.h, diff --git a/cpukit/sapi/src/Makefile.am b/cpukit/sapi/src/Makefile.am index b0bd6d78fe..d71c0e11f7 100644 --- a/cpukit/sapi/src/Makefile.am +++ b/cpukit/sapi/src/Makefile.am @@ -10,7 +10,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 |