From db0b36999d611a0e4b555cde9dc3210e41d5e1bc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 13:11:22 +0000 Subject: 2003-09-29 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 35 +++++++++++++++++++--- c/src/lib/libbsp/powerpc/mbx8xx/configure.ac | 1 - .../lib/libbsp/powerpc/mbx8xx/include/Makefile.am | 30 ------------------- 4 files changed, 38 insertions(+), 35 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am (limited to 'c/src/lib/libbsp/powerpc/mbx8xx') diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index ee3be4e5b4..4692e6821b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-04 Joel Sherrill * clock/p_clock.c, ide/pcmcia_ide.c, include/bsp.h, include/coverhd.h, diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index f974df1642..a91cf18c7e 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -5,13 +5,40 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = include clock console irq network ide startup vectors \ - @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console irq network ide startup vectors @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = README bsp_specs times +include_bspdir = $(includedir)/bsp + +include_HEADERS += include/coverhd.h +include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/bsp: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp + +$(PROJECT_INCLUDE)/bsp/mbx.h: include/mbx.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mbx.h + +$(PROJECT_INCLUDE)/bsp/commproc.h: include/commproc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/commproc.h + +$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac index cf0eb1b34c..ef4b32a690 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac +++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac @@ -120,7 +120,6 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile irq/Makefile ide/Makefile network/Makefile diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am deleted file mode 100644 index 712cebaa6f..0000000000 --- a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - - -include_bspdir = $(includedir)/bsp - -include_HEADERS = bsp.h coverhd.h bspopts.h -include_bsp_HEADERS = mbx.h commproc.h 8xx_immap.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/bsp/%.h : %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3