summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 14:37:37 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 14:37:37 +0000
commitcc5f43903d8e2cf980bebb95569ed6a8c5b6d16c (patch)
tree755f4839519c6087509f8202fbe9e74ec001e6af /c/src
parente1f6878d12a2bf3112a692ddc15c6a32f598d1cb (diff)
downloadrtems-cc5f43903d8e2cf980bebb95569ed6a8c5b6d16c.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. * ide/Makefile.am: Cosmetics. * irq/Makefile.am: Add preinstallation dirstamp support. * network/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * vectors/Makefile.am: Add preinstallation dirstamp support. * wrapup/Makefile.am: Cosmetics.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog12
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am25
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am24
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am20
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am9
10 files changed, 51 insertions, 44 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 33a5629008..16caa849b9 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add preinstallation dirstamp support.
+ * clock/Makefile.am: Cosmetics.
+ * console/Makefile.am: Cosmetics.
+ * ide/Makefile.am: Cosmetics.
+ * irq/Makefile.am: Add preinstallation dirstamp support.
+ * network/Makefile.am: Cosmetics.
+ * startup/Makefile.am: Cosmetics.
+ * vectors/Makefile.am: Add preinstallation dirstamp support.
+ * 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/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
index a91cf18c7e..fa582405ce 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
@@ -20,25 +20,26 @@ all-local: $(PREINSTALL_FILES)
EXTRA_DIST = times
-$(PROJECT_INCLUDE)/bsp:
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp
+ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-$(PROJECT_INCLUDE)/bsp/mbx.h: include/mbx.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+
+$(PROJECT_INCLUDE)/bsp/mbx.h: include/mbx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mbx.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mbx.h
-$(PROJECT_INCLUDE)/bsp/commproc.h: include/commproc.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/bsp/commproc.h: include/commproc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/commproc.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/commproc.h
-$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
-$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
- $(INSTALL_DATA) $< $@
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
-
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
index fc841b4e1e..f20d3ae2c4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/clock/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../shared/clock
C_FILES = p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
index 0d451d4e79..9f4fde7145 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/console.rel
C_FILES = console.c
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
index c6ad6229df..e0384c7ef7 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am
@@ -2,7 +2,6 @@
## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
##
-
PGM = # $(ARCH)/console.rel
C_FILES = idecfg.c pcmcia_ide.c
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
index a171395dcb..b518036ab8 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
C_FILES = irq.c irq_init.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -15,18 +14,6 @@ OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/bsp:
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/bsp/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
- $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
-
#
# (OPTIONAL) Add local stuff here using +=
#
@@ -40,4 +27,15 @@ all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM)
EXTRA_DIST = irq.c irq_asm.S irq_init.c
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
+ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+
+$(PROJECT_INCLUDE)/bsp/irq.h: irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
+
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
index 6adb48797c..35260c6e8f 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/network.rel
C_FILES = network.c
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
index 6b23851720..0bcba734e6 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
index a514a0c181..fe448269fd 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
C_FILES = vectors_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -24,16 +23,17 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(OBJS)
$(make-rel)
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/bsp:
- $(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/bsp/%.h: %.h
- $(INSTALL_DATA) $< $@
+all-local: $(PREINSTALL_FILES) $(OBJS)
+
+PREINSTALL_FILES =
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
- $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
+$(PROJECT_INCLUDE)/bsp/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
+ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-all-local: $(PREINSTALL_FILES) $(OBJS)
+$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
index 50a1f1d8f3..19231284a4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
@@ -13,10 +13,11 @@ BSP_PIECES = clock irq ide startup console vectors $(NETWORKING)
# mpc8xx/mmu mpc8xx/timer mpc8xx/vectors
# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
- $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
- ../@exceptions@/$(ARCH)/rtems-cpu.rel \
- $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.$(OBJEXT))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \
+ ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
+ ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
+ ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \
+ ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a
include $(top_srcdir)/../../../../automake/compile.am