From a77cd06666febd2e8f34cd7d82ffe2062cf12552 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 2 Dec 2003 11:24:16 +0000 Subject: 2003-12-02 Ralf Corsepius * bootloader/Makefile.am: Put all files into EXTRA_DIST. * vme/Makefile.am: Ditto. * console/Makefile.am: Move H_FILES to include_bsp_HEADERS. Add preinstallation dirstamp support. * irq/Makefile.am: Ditto. * motorola/Makefile.am: Ditto. * openpic/Makefile.am: Ditto. * pci/Makefile.am: Ditto. * residual/Makefile.am: Ditto. * vectors/Makefile.am: Ditto. * Makefile.am: Remove empty lines. * clock/Makefile.am: Ditto. * include/Makefile.am: Ditto. * startup/Makefile.am: Ditto. --- c/src/lib/libbsp/powerpc/shared/ChangeLog | 17 ++++++++++++ c/src/lib/libbsp/powerpc/shared/Makefile.am | 1 - .../libbsp/powerpc/shared/bootloader/Makefile.am | 12 +++------ c/src/lib/libbsp/powerpc/shared/clock/Makefile.am | 1 - .../lib/libbsp/powerpc/shared/console/Makefile.am | 31 ++++++++++++++-------- .../lib/libbsp/powerpc/shared/include/Makefile.am | 1 - c/src/lib/libbsp/powerpc/shared/irq/Makefile.am | 19 ++++++------- .../lib/libbsp/powerpc/shared/motorola/Makefile.am | 22 ++++++++------- .../lib/libbsp/powerpc/shared/openpic/Makefile.am | 22 ++++++++------- c/src/lib/libbsp/powerpc/shared/pci/Makefile.am | 22 ++++++++------- .../lib/libbsp/powerpc/shared/residual/Makefile.am | 26 +++++++++++------- .../lib/libbsp/powerpc/shared/startup/Makefile.am | 3 +-- .../lib/libbsp/powerpc/shared/vectors/Makefile.am | 22 ++++++++------- c/src/lib/libbsp/powerpc/shared/vme/Makefile.am | 9 ++----- 14 files changed, 118 insertions(+), 90 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index 733f745c98..9dfae5d9d2 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,20 @@ +2003-12-02 Ralf Corsepius + + * bootloader/Makefile.am: Put all files into EXTRA_DIST. + * vme/Makefile.am: Ditto. + * console/Makefile.am: Move H_FILES to include_bsp_HEADERS. + Add preinstallation dirstamp support. + * irq/Makefile.am: Ditto. + * motorola/Makefile.am: Ditto. + * openpic/Makefile.am: Ditto. + * pci/Makefile.am: Ditto. + * residual/Makefile.am: Ditto. + * vectors/Makefile.am: Ditto. + * Makefile.am: Remove empty lines. + * clock/Makefile.am: Ditto. + * include/Makefile.am: Ditto. + * startup/Makefile.am: Ditto. + 2003-10-22 Joel Sherrill PR 510/bsps diff --git a/c/src/lib/libbsp/powerpc/shared/Makefile.am b/c/src/lib/libbsp/powerpc/shared/Makefile.am index 3181afda8f..94c101e30e 100644 --- a/c/src/lib/libbsp/powerpc/shared/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - if need_shared SUBDIRS = clock console include pci residual openpic irq vectors start \ startup motorola bootloader vme diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am index c5a351df23..6803fcdf83 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am @@ -2,16 +2,12 @@ ## $Id$ ## +EXTRA_DIST = em86.c lib.c misc.c mm.c pci.c zlib.c -C_FILES = em86.c lib.c misc.c mm.c pci.c zlib.c +EXTRA_DIST += bootldr.h zlib.h pci.h -H_FILES = bootldr.h zlib.h pci.h +EXTRA_DIST += em86real.S exception.S head.S -S_FILES = em86real.S exception.S head.S - -noinst_DATA = ppcboot.lds - -EXTRA_DIST = README bootldr.h em86.c em86real.S exception.S head.S lib.c \ - misc.c mm.c pci.c pci.h ppcboot.lds zlib.c zlib.h +EXTRA_DIST += ppcboot.lds include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am index b446c17a00..ebc3cafd5f 100644 --- a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - C_FILES = p_clock.c EXTRA_DIST = p_clock.c diff --git a/c/src/lib/libbsp/powerpc/shared/console/Makefile.am b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am index ee59187cef..c825913276 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am @@ -2,23 +2,32 @@ ## $Id$ ## - C_FILES = console.c inch.c polled_io.c uart.c reboot.c -H_FILES = consoleIo.h keyboard.h uart.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = consoleIo.h keyboard.h uart.h -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = console.c inch.c polled_io.c uart.c reboot.c console.inl -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) + +$(PROJECT_INCLUDE)/bsp/consoleIo.h: consoleIo.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/consoleIo.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/consoleIo.h + +$(PROJECT_INCLUDE)/bsp/keyboard.h: keyboard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/keyboard.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/keyboard.h -EXTRA_DIST = console.c inch.c polled_io.c uart.c \ - reboot.c console.inl +$(PROJECT_INCLUDE)/bsp/uart.h: uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am index fb2f95f1a5..da48a8576f 100644 --- a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - noinst_HEADERS = nvram.h bsp.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am index 0d228eefc1..a5881e5343 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - C_FILES = i8259.c irq.c irq_init.c include_bspdir = $(includedir)/bsp @@ -10,17 +9,19 @@ include_bsp_HEADERS = irq.h S_FILES = irq_asm.S -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = i8259.c irq.c irq_asm.S irq_init.c -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -EXTRA_DIST = i8259.c irq.c irq_asm.S irq_init.c +$(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/shared/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am index 41ec12dfd0..48c52e5a46 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am @@ -2,22 +2,24 @@ ## $Id$ ## - C_FILES = motorola.c -H_FILES = motorola.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = motorola.h -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = motorola.c -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -EXTRA_DIST = motorola.c motorola.h +$(PROJECT_INCLUDE)/bsp/motorola.h: motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am index 90709ae343..50b86194a6 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am @@ -2,22 +2,24 @@ ## $Id$ ## - C_FILES = openpic.c -H_FILES = openpic.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = openpic.h -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = openpic.c -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -EXTRA_DIST = openpic.c +$(PROJECT_INCLUDE)/bsp/openpic.h: openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am index 343be0b095..a16225457f 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am @@ -2,22 +2,24 @@ ## $Id$ ## - C_FILES = pci.c detect_raven_bridge.c pcifinddevice.c -H_FILES = pci.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = pci.h -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = pci.c detect_raven_bridge.c pcifinddevice.c -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -EXTRA_DIST = pci.c pci.h detect_raven_bridge.c pcifinddevice.c +$(PROJECT_INCLUDE)/bsp/pci.h: pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am index 53c396dd5f..0d457526b0 100644 --- a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am @@ -2,22 +2,28 @@ ## $Id$ ## - C_FILES = residual.c -H_FILES = pnp.h residual.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = pnp.h residual.h + +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +EXTRA_DIST = residual.c -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/pnp.h: pnp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pnp.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pnp.h -EXTRA_DIST = residual.c +$(PROJECT_INCLUDE)/bsp/residual.h: residual.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/residual.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/residual.h include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am index aa2370b741..c3e0856b43 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am @@ -2,11 +2,10 @@ ## $Id$ ## - C_FILES = bspstart.c pgtbl_setup.c pgtbl_activate.c noinst_DATA = linkcmds -EXTRA_DIST = bspstart.c linkcmds pgtbl_setup.c pgtbl_activate.c +EXTRA_DIST = bspstart.c linkcmds pgtbl_setup.c pgtbl_activate.c include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am index ec0964fc44..55fc329f6c 100644 --- a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am @@ -2,24 +2,26 @@ ## $Id$ ## - C_FILES = vectors_init.c -H_FILES = vectors.h +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = vectors.h S_FILES = vectors.S -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +EXTRA_DIST = vectors.S vectors_init.c -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h) +PREINSTALL_FILES = -all-local: $(PREINSTALL_FILES) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -EXTRA_DIST = vectors.S vectors.h vectors_init.c +$(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/shared/vme/Makefile.am b/c/src/lib/libbsp/powerpc/shared/vme/Makefile.am index 3b9bd46cb1..2264735ae9 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/vme/Makefile.am @@ -2,12 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 - -H_FILES = VMEConfig.h VME.h - -C_FILES = vmeconfig.c - -EXTRA_DIST = vmeconfig.c +# FIXME: This doesn't make much sense here +EXTRA_DIST = vmeconfig.c VMEConfig.h VME.h include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3