From 2afd32b7d73fd6fdd4edcd19714619004cfb9ffa Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 19 Jun 2001 14:26:49 +0000 Subject: 2001-06-19 Ralf Corsepius * comm/Makefile.am: Use *_HEADERS instead of *H_FILES. * io/Makefile.am: Ditto. * irq/Makefile.am: Ditto. * pci/Makefile.am: Ditto. --- c/src/lib/libbsp/i386/shared/ChangeLog | 7 +++++++ c/src/lib/libbsp/i386/shared/comm/Makefile.am | 5 +++-- c/src/lib/libbsp/i386/shared/io/Makefile.am | 6 ------ c/src/lib/libbsp/i386/shared/irq/Makefile.am | 7 ++++--- c/src/lib/libbsp/i386/shared/pci/Makefile.am | 7 ++++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/c/src/lib/libbsp/i386/shared/ChangeLog b/c/src/lib/libbsp/i386/shared/ChangeLog index 39e2357193..7e94048a6b 100644 --- a/c/src/lib/libbsp/i386/shared/ChangeLog +++ b/c/src/lib/libbsp/i386/shared/ChangeLog @@ -1,4 +1,11 @@ + * comm/Makefile.am: Use *_HEADERS instead of *H_FILES. + * io/Makefile.am: Ditto. + * irq/Makefile.am: Ditto. + * pci/Makefile.am: Ditto. + +2000-10-19 Joel Sherrill + * common/uart.h: Added prototype for BSP_uart_set_baud(). 2000-10-19 Charles-Antoine Gauthier diff --git a/c/src/lib/libbsp/i386/shared/comm/Makefile.am b/c/src/lib/libbsp/i386/shared/comm/Makefile.am index 2fa090f145..63ffaefb79 100644 --- a/c/src/lib/libbsp/i386/shared/comm/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/comm/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = uart.h tty_drv.h i386_io.h +include_HEADERS = uart.h tty_drv.h i386_io.h C_FILES = i386-stub-glue.c i386-stub.c uart.c tty_drv.c gdb_glue.c @@ -15,7 +15,8 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(PREINSTALL_FILES) diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.am b/c/src/lib/libbsp/i386/shared/io/Makefile.am index 69fbdf569b..b85598a181 100644 --- a/c/src/lib/libbsp/i386/shared/io/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/io/Makefile.am @@ -4,12 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = - -C_FILES = - all-local: $(PREINSTALL_FILES) -EXTRA_DIST = - include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/shared/irq/Makefile.am b/c/src/lib/libbsp/i386/shared/irq/Makefile.am index 5b4282cb53..fc20717f28 100644 --- a/c/src/lib/libbsp/i386/shared/irq/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/irq/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = irq.h irq_asm.h +include_HEADERS = irq.h irq_asm.h C_FILES = idt.c irq.c irq_init.c S_FILES = irq_asm.S @@ -14,10 +14,11 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(PREINSTALL_FILES) -EXTRA_DIST = idt.c irq.c irq.h irq_asm.S irq_asm.h irq_init.c +EXTRA_DIST = idt.c irq.c irq_asm.S irq_init.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/shared/pci/Makefile.am b/c/src/lib/libbsp/i386/shared/pci/Makefile.am index d33cca7737..91dd5f63ab 100644 --- a/c/src/lib/libbsp/i386/shared/pci/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/pci/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = pcibios.h +include_HEADERS = pcibios.h C_FILES = pcibios.c @@ -13,10 +13,11 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(PREINSTALL_FILES) -EXTRA_DIST = pcibios.c pcibios.h +EXTRA_DIST = pcibios.c include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3