From 72c9ccf20507577d8e9050726d9e490c490b8b9b Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 11 Dec 2003 06:22:34 +0000
Subject: 2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Misc. fixes.
	* bsp.am: Add project_libdir.
---
 c/src/lib/libbsp/ChangeLog   |  5 +++++
 c/src/lib/libbsp/Makefile.am | 22 ++++++++++------------
 c/src/lib/libbsp/bsp.am      |  2 ++
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'c/src')

diff --git a/c/src/lib/libbsp/ChangeLog b/c/src/lib/libbsp/ChangeLog
index ba2098d8b7..3753093fb1 100644
--- a/c/src/lib/libbsp/ChangeLog
+++ b/c/src/lib/libbsp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Misc. fixes.
+	* bsp.am: Add project_libdir.
+
 2003-12-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bspstart.am: New.
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index 4ffbc619e7..e7a59d2c44 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -41,22 +41,16 @@ shmdr/$(ARCH)/$(dirstamp):
 	@: > shmdr/$(ARCH)/$(dirstamp)
 shmdr/$(ARCH)/%.$(OBJEXT): shmdr/%.c shmdr/$(ARCH)/$(dirstamp)
 	${COMPILE} -o $@ -c $<
-shmdr/$(ARCH)/shmdr.rel: $(shmdr_OBJS)
+shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel: $(shmdr_OBJS)
 	$(make-rel)
 
-$(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr.rel
-	$(INSTALL_DATA) $< $@
-
 if HAS_MP
-include_HEADERS = shmdir/shm_driver.h shmdir/mpci.h
-
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel
+include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
 
-all-local: $(PREINSTALL_FILES) shmdr/$(ARCH)/shmdr.rel $(TMPINSTALL_FILES)
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+project_lib_DATA = shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel
 endif
 
-.PRECIOUS: shmdr/$(ARCH)/shmdr.rel
-
 EXTRA_DIST += shmdr/README shmdr/addlq.c shmdr/cnvpkt.c shmdr/dump.c \
     shmdr/fatal.c shmdr/getlq.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c \
     shmdr/intr.c shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c \
@@ -70,13 +64,17 @@ $(PROJECT_INCLUDE)/$(dirstamp):
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 if HAS_MP
-$(PROJECT_INCLUDE)/shm_driver.h: shmdir/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/shm_driver.h: shmdr/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
 
-$(PROJECT_INCLUDE)/mpci.h: shmdir/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/mpci.h: shmdr/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
+
+${PROJECT_RELEASE}/lib/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/shmdr$(LIB_VARIANT).rel
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/shmdr$(LIB_VARIANT).rel
 endif
 
 include $(top_srcdir)/automake/subdirs.am
diff --git a/c/src/lib/libbsp/bsp.am b/c/src/lib/libbsp/bsp.am
index 16d55a7fbd..bf8918dc1e 100644
--- a/c/src/lib/libbsp/bsp.am
+++ b/c/src/lib/libbsp/bsp.am
@@ -7,6 +7,8 @@ dist_bsplib_DATA = bsp_specs
 include_HEADERS  = include/bsp.h
 nodist_include_HEADERS = include/bspopts.h
 
+project_libdir = $(libdir)
+
 $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib
 	@: > $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
-- 
cgit v1.2.3