summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-19 14:36:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-12-19 14:36:48 +0000
commitd8c76574146bb30556120720fd6353828473b599 (patch)
treedd4713d016412d8a7ae8dc5f1ed1f0bb6dbdb167 /c/src
parent2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-d8c76574146bb30556120720fd6353828473b599.tar.bz2
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/Makefile.am: Add multilib support. * optman/Makefile.am: Add multilib support.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/exec/rtems/ChangeLog5
-rw-r--r--c/src/exec/rtems/optman/Makefile.am6
-rw-r--r--c/src/exec/rtems/src/Makefile.am2
-rw-r--r--c/src/optman/rtems/Makefile.am6
4 files changed, 12 insertions, 7 deletions
diff --git a/c/src/exec/rtems/ChangeLog b/c/src/exec/rtems/ChangeLog
index 988df6b60b..ac47623d72 100644
--- a/c/src/exec/rtems/ChangeLog
+++ b/c/src/exec/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * src/Makefile.am: Add multilib support.
+ * optman/Makefile.am: Add multilib support.
+
2001-10-23 Joel Sherrill <joel@OARcorp.com>
* macros/rtems/rtems/asr.nil: Fixed typo.
diff --git a/c/src/exec/rtems/optman/Makefile.am b/c/src/exec/rtems/optman/Makefile.am
index 1126155c87..f1b797bc06 100644
--- a/c/src/exec/rtems/optman/Makefile.am
+++ b/c/src/exec/rtems/optman/Makefile.am
@@ -10,14 +10,14 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-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/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am
index f6ec0adecd..8b8824876c 100644
--- a/c/src/exec/rtems/src/Makefile.am
+++ b/c/src/exec/rtems/src/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-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/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am
index 1126155c87..f1b797bc06 100644
--- a/c/src/optman/rtems/Makefile.am
+++ b/c/src/optman/rtems/Makefile.am
@@ -10,14 +10,14 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-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) $< $@
#