summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 06:57:46 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 06:57:46 +0000
commit0ece4f3a9adc23fde635621f9dc5018b9c5d2731 (patch)
treeabcaaad027748ea34bd8eba3cff41bfc27284180 /c/src/lib
parent2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-0ece4f3a9adc23fde635621f9dc5018b9c5d2731.tar.bz2
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * shmsupp/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics.
Diffstat (limited to 'c/src/lib')
-rw-r--r--c/src/lib/libbsp/i960/cvme961/ChangeLog10
-rw-r--r--c/src/lib/libbsp/i960/cvme961/Makefile.am4
-rw-r--r--c/src/lib/libbsp/i960/cvme961/clock/Makefile.am1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/console/Makefile.am1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/startup/Makefile.am1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/timer/Makefile.am1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am8
8 files changed, 17 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog
index 9178030db2..3520f49d3f 100644
--- a/c/src/lib/libbsp/i960/cvme961/ChangeLog
+++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add preinstallation dirstamp support.
+ * clock/Makefile.am: Cosmetics.
+ * console/Makefile.am: Cosmetics.
+ * shmsupp/Makefile.am: Cosmetics.
+ * startup/Makefile.am: Cosmetics.
+ * timer/Makefile.am: Cosmetics.
+ * wrapup/Makefile.am: Cosmetics.
+
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.am b/c/src/lib/libbsp/i960/cvme961/Makefile.am
index ee5b8f90f2..a537f1290a 100644
--- a/c/src/lib/libbsp/i960/cvme961/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/Makefile.am
@@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times
-$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
include $(top_srcdir)/../../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am
index 499a664bbb..01bde7b3e4 100644
--- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/clock.rel
C_FILES = ckinit.c
diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am
index 0d451d4e79..9f4fde7145 100644
--- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/console.rel
C_FILES = console.c
diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am
index 1aa7a169b3..f633b0dc37 100644
--- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = ${ARCH}/shmsupp.rel
C_FILES = addrconv.c getcfg.c lock.c mpisr.c
diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am
index dcb228ecb1..485c3b1273 100644
--- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel
diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am
index e70c4770b2..88f8b2ff5b 100644
--- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/timer.rel
C_FILES = timer.c
diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am
index 19875bb81b..380a60069b 100644
--- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am
@@ -16,9 +16,11 @@ include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
- $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \
- $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
+OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \
+ ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
+ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \
+ $(foreach piece, $(GENERIC_FILES), \
+ ../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a