diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-03 06:57:55 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-03 06:57:55 +0000 |
commit | 45fe4b9703a4e43e373612afe240aa9023bef798 (patch) | |
tree | 45ecb08ac896116d44de0641263a88c31345fb41 /c/src | |
parent | 2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-45fe4b9703a4e43e373612afe240aa9023bef798.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')
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/clock/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/console/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/startup/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/timer/Makefile.am | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am | 8 |
7 files changed, 16 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog index 352f585e73..c6c10a6d66 100644 --- a/c/src/lib/libbsp/i960/i960sim/ChangeLog +++ b/c/src/lib/libbsp/i960/i960sim/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/i960/i960sim/Makefile.am b/c/src/lib/libbsp/i960/i960sim/Makefile.am index 8266588bbe..0a35cb214e 100644 --- a/c/src/lib/libbsp/i960/i960sim/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/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/i960sim/clock/Makefile.am b/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am index c01b48d7de..b0ab135108 100644 --- a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am index 3efd761559..460dc58e7e 100644 --- a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am index b6de4720bd..87873bf273 100644 --- a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am index c247d386bb..8ec4b5ca6a 100644 --- a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel diff --git a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am index dd3638ce32..4e26fceadf 100644 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/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 |