From 2821666fa1d31c1fc6f65690a0bc57618d9f4a81 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 14:11:26 +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/m68k/mvme167/ChangeLog | 7 ++++++ c/src/lib/libbsp/m68k/mvme167/Makefile.am | 30 ++++++++++++++++++++--- c/src/lib/libbsp/m68k/mvme167/configure.ac | 1 - c/src/lib/libbsp/m68k/mvme167/include/Makefile.am | 23 ----------------- 4 files changed, 34 insertions(+), 27 deletions(-) delete mode 100644 c/src/lib/libbsp/m68k/mvme167/include/Makefile.am (limited to 'c/src/lib/libbsp/m68k/mvme167') diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 350c6724fb..7480288180 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/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/ckinit.c, console/console-recording.c, console/console.c, diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 30fa854648..16362f7b0c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -5,13 +5,37 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories +# from the individual .rel files built in other directories -SUBDIRS = . include start startup clock console fatal timer network wrapup +SUBDIRS = . start startup clock console fatal timer network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h +include_HEADERS += include/page_table.h +include_HEADERS += include/fatal.h + +nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h + +all: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/page_table.h: include/page_table.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h + +$(PROJECT_INCLUDE)/fatal.h: include/fatal.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/fatal.h + +$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.ac b/c/src/lib/libbsp/m68k/mvme167/configure.ac index ec3d848e02..7d3ca3c864 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme167/configure.ac @@ -55,7 +55,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile fatal/Makefile -include/Makefile network/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am deleted file mode 100644 index aa6deb2fa5..0000000000 --- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h fatal.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -mvme16x_hw.h: $(srcdir)/../../shared/mvme/mvme16x_hw.h - cp $< $@ -CLEANFILES = mvme16x_hw.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3