2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Add preinstallation dirstamp support.
	* canbus/Makefile.am: Cosmetics.
	* clock/Makefile.am: Cosmetics.
	* console/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.
This commit is contained in:
Ralf Corsepius
2003-12-03 14:37:26 +00:00
parent fd94af13b7
commit 9eb807e6eb
10 changed files with 58 additions and 50 deletions

View File

@@ -1,3 +1,15 @@
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support.
* canbus/Makefile.am: Cosmetics.
* clock/Makefile.am: Cosmetics.
* console/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>
* canbus/Makefile.am: Remove all-local: $(ARCH).

View File

@@ -13,39 +13,37 @@ include $(top_srcdir)/../../bsp.am
include_bspdir = $(includedir)/bsp
include_HEADERS += include/coverhd.h
include_HEADERS += include/canbus.h
include_HEADERS += include/info.h
include_bsp_HEADERS = include/commproc.h
include_bsp_HEADERS += include/8xx_immap.h
include_HEADERS += include/coverhd.h include/canbus.h include/info.h
include_bsp_HEADERS = include/commproc.h include/8xx_immap.h
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/commproc.h: include/commproc.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/commproc.h
$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.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)/canbus.h: include/canbus.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/canbus.h: include/canbus.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/canbus.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/canbus.h
$(PROJECT_INCLUDE)/info.h: include/info.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/info.h: include/info.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/info.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/info.h
$(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 $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -2,7 +2,6 @@
## $Id$
##
PGM = $(ARCH)/canbus.rel
C_FILES = canbus.c

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../shared/clock
C_FILES = p_clock.c

View File

@@ -2,7 +2,6 @@
## $Id$
##
PGM = $(ARCH)/console.rel
C_FILES = console.c

View File

@@ -2,7 +2,6 @@
## $Id$
##
include_bspdir = $(includedir)/bsp
C_FILES = irq.c irq_init.c
@@ -16,15 +15,6 @@ OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
$(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 +=
#
@@ -38,4 +28,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

View File

@@ -2,7 +2,6 @@
## $Id$
##
PGM = $(ARCH)/network.rel
C_FILES = network.c

View File

@@ -2,7 +2,6 @@
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel

View File

@@ -2,7 +2,6 @@
## $Id$
##
C_FILES = vectors_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -24,15 +23,17 @@ include $(top_srcdir)/../../../../automake/lib.am
$(PGM): $(OBJS)
$(make-rel)
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
$(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(PREINSTALL_FILES) $(OBJS)
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(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

View File

@@ -13,10 +13,11 @@ BSP_PIECES = clock irq startup start canbus vectors console $(NETWORKING)
# mpc860/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)/$(RTEMS_CPU_MODEL)/*/$(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)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libbsp.a
include $(top_srcdir)/../../../../automake/compile.am