summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/armulator
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 05:17:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 05:17:10 +0000
commite7a4084595ed1e032487df81cedba103afb2df74 (patch)
treea119346ba69b05f1028d9e7b6783a123a2613c4c /c/src/lib/libbsp/arm/armulator
parent7f0e84c5fad5cb757647ec6d94cbff3aedfb88bb (diff)
downloadrtems-e7a4084595ed1e032487df81cedba103afb2df74.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. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics.
Diffstat (limited to 'c/src/lib/libbsp/arm/armulator')
-rw-r--r--c/src/lib/libbsp/arm/armulator/ChangeLog9
-rw-r--r--c/src/lib/libbsp/arm/armulator/Makefile.am4
-rw-r--r--c/src/lib/libbsp/arm/armulator/clock/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/armulator/console/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/armulator/startup/Makefile.am2
-rw-r--r--c/src/lib/libbsp/arm/armulator/timer/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am8
7 files changed, 16 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 2deb64cbf1..0c3c279a77 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add preinstallation dirstamp support.
+ * clock/Makefile.am: Cosmetics.
+ * console/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/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index f2ebbf4283..3dd7765427 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -14,8 +14,8 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
all-local: $(PREINSTALL_FILES)
-$(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/arm/armulator/clock/Makefile.am b/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
index c01b48d7de..b0ab135108 100644
--- a/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/clock/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/clock.rel
C_FILES = clockdrv.c
diff --git a/c/src/lib/libbsp/arm/armulator/console/Makefile.am b/c/src/lib/libbsp/arm/armulator/console/Makefile.am
index c4784cad27..9667c026e9 100644
--- a/c/src/lib/libbsp/arm/armulator/console/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/console/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/console.rel
diff --git a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
index 81aef0b8e7..158d380190 100644
--- a/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/startup/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel
@@ -30,7 +29,6 @@ include $(top_srcdir)/../../../../automake/lib.am
# to create the program's environment.
AM_CPPFLAGS += -DARM_RDI_MONITOR
-
$(PGM): $(OBJS)
$(make-rel)
diff --git a/c/src/lib/libbsp/arm/armulator/timer/Makefile.am b/c/src/lib/libbsp/arm/armulator/timer/Makefile.am
index c247d386bb..8ec4b5ca6a 100644
--- a/c/src/lib/libbsp/arm/armulator/timer/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/timer/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/timer.rel
diff --git a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
index dd3638ce32..4e26fceadf 100644
--- a/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/wrapup/Makefile.am
@@ -8,9 +8,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