From 9a6f471895b214cc177a9f4754b3b9700fe546b4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 05:17:21 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * irq/Makefile.am: Add preinstallation dirstamp support. * network/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/arm/edb7312/ChangeLog | 7 +++++++ c/src/lib/libbsp/arm/edb7312/Makefile.am | 8 ++++---- c/src/lib/libbsp/arm/edb7312/irq/Makefile.am | 19 +++++++++++-------- c/src/lib/libbsp/arm/edb7312/network/Makefile.am | 11 ----------- c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am | 7 ++++--- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 2db6de54d1..f8316189c1 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,10 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * irq/Makefile.am: Add preinstallation dirstamp support. + * network/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index f3142a51dd..7df15cd57f 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -16,12 +16,12 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ep7312.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.h -$(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/edb7312/irq/Makefile.am b/c/src/lib/libbsp/arm/edb7312/irq/Makefile.am index b54ddb4619..654f39f5e6 100644 --- a/c/src/lib/libbsp/arm/edb7312/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/irq/Makefile.am @@ -25,14 +25,6 @@ include $(top_srcdir)/../../../../automake/lib.am AM_CPPFLAGS += -I$(srcdir) -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - $(PGM): $(OBJS) $(make-rel) @@ -44,4 +36,15 @@ all-local: $(OBJS) $(PGM) EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE) + @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) + +$(PROJECT_INCLUDE)/irq.h: irq.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am index cc19237e0c..e5f3447942 100644 --- a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am @@ -7,8 +7,6 @@ PGM = $(ARCH)/network.rel C_FILES = network.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -include_HEADERS = - OBJS = $(C_O_FILES) include $(top_srcdir)/../../../../automake/compile.am @@ -19,15 +17,6 @@ include $(top_srcdir)/../../../../automake/lib.am # AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - $(PGM): $(OBJS) $(make-rel) diff --git a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am index 705aaa5cc9..4463017b75 100644 --- a/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/wrapup/Makefile.am @@ -5,9 +5,10 @@ BSP_FILES = clock console startup irq timer network start # 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)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3