From 23090f33860ae60badb5eb6e781e99a79801720a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 13:22:48 +0000 Subject: 2003-09-29 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * include/bsp.h: Add copy of ../shared/include/bsp.h (Violates BSP coding standards). * configure.ac: Reflect changes above. * irq/Makefile.am: Fix header installation. * motorola/Makefile.am: Fix header installation. * openpic/Makefile.am: Fix header installation. * pci/Makefile.am: Fix header installation. --- .../powerpc/motorola_powerpc/pci/Makefile.am | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am index 43c4327bc0..eddff6d895 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am @@ -2,37 +2,33 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/pci C_FILES = pci.c detect_raven_bridge.c pcifinddevice.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = ../../shared/pci/pci.h - -H_FILES = ../../shared/pci/pci.h +nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/pci/pci.h OBJS = $(C_O_FILES) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -# -# (OPTIONAL) Add local stuff here using += -# - AM_CFLAGS += -O2 -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $< - -$(PROJECT_INCLUDE)/bsp/pci.h: ../../shared/pci/pci.h - $(INSTALL_DATA) $< $@ - # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/pci.h all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/bsp: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp + +$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../shared/pci/pci.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h + include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3