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/openpic/Makefile.am | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc/openpic') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am index 13b0a27c6c..b21ce22415 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am @@ -2,33 +2,28 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/openpic C_FILES = openpic.c include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = ../../shared/openpic/openpic.h - -H_FILES = ../../shared/openpic/openpic.h +nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/openpic/openpic.h OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $< $@ - -$(PROJECT_INCLUDE)/bsp/openpic.h: ../../shared/openpic/openpic.h - $(INSTALL_DATA) $< $@ +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) -# -# (OPTIONAL) Add local stuff here using += -# +PREINSTALL_FILES = -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/openpic.h +$(PROJECT_INCLUDE)/bsp: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp -all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) +$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../shared/openpic/openpic.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3