From 602610f6364eac5ce602965e92cd176adc9678d6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 12:06:49 +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/i960/cvme961/ChangeLog | 7 ++++++ c/src/lib/libbsp/i960/cvme961/Makefile.am | 14 +++++++++--- c/src/lib/libbsp/i960/cvme961/configure.ac | 2 -- c/src/lib/libbsp/i960/cvme961/include/Makefile.am | 23 -------------------- c/src/lib/libbsp/i960/i960sim/ChangeLog | 7 ++++++ c/src/lib/libbsp/i960/i960sim/Makefile.am | 14 +++++++++--- c/src/lib/libbsp/i960/i960sim/configure.ac | 3 --- c/src/lib/libbsp/i960/i960sim/include/Makefile.am | 23 -------------------- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 7 ++++++ c/src/lib/libbsp/i960/rxgen960/Makefile.am | 14 +++++++++--- c/src/lib/libbsp/i960/rxgen960/configure.ac | 3 --- c/src/lib/libbsp/i960/rxgen960/include/Makefile.am | 25 ---------------------- 12 files changed, 54 insertions(+), 88 deletions(-) delete mode 100644 c/src/lib/libbsp/i960/cvme961/include/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/i960sim/include/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/rxgen960/include/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog index 66d29deba2..906ff67ed3 100644 --- a/c/src/lib/libbsp/i960/cvme961/ChangeLog +++ b/c/src/lib/libbsp/i960/cvme961/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-24 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.am b/c/src/lib/libbsp/i960/cvme961/Makefile.am index 119b2d518c..ee5b8f90f2 100644 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/Makefile.am @@ -5,12 +5,20 @@ 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 start startup clock console shmsupp timer wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console shmsupp timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/i960/cvme961/configure.ac b/c/src/lib/libbsp/i960/cvme961/configure.ac index cda21234d0..20859786c7 100644 --- a/c/src/lib/libbsp/i960/cvme961/configure.ac +++ b/c/src/lib/libbsp/i960/cvme961/configure.ac @@ -18,12 +18,10 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.am b/c/src/lib/libbsp/i960/cvme961/include/Makefile.am deleted file mode 100644 index b6aa381d48..0000000000 --- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog index 8f3e080f8a..f15ac9bfd0 100644 --- a/c/src/lib/libbsp/i960/i960sim/ChangeLog +++ b/c/src/lib/libbsp/i960/i960sim/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-24 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/i960/i960sim/Makefile.am b/c/src/lib/libbsp/i960/i960sim/Makefile.am index b17ebea158..8266588bbe 100644 --- a/c/src/lib/libbsp/i960/i960sim/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/Makefile.am @@ -5,12 +5,20 @@ 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 start startup clock console timer wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/i960/i960sim/configure.ac b/c/src/lib/libbsp/i960/i960sim/configure.ac index c628fb38ca..c13b067c9d 100644 --- a/c/src/lib/libbsp/i960/i960sim/configure.ac +++ b/c/src/lib/libbsp/i960/i960sim/configure.ac @@ -14,13 +14,10 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i960/i960sim/include/Makefile.am b/c/src/lib/libbsp/i960/i960sim/include/Makefile.am deleted file mode 100644 index b6aa381d48..0000000000 --- a/c/src/lib/libbsp/i960/i960sim/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index dfd641af40..b8e112d179 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/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-24 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/Makefile.am index 1d443861bc..f77893b71e 100644 --- a/c/src/lib/libbsp/i960/rxgen960/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.am @@ -5,12 +5,20 @@ 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 start startup clock console timer wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +noinst_HEADERS = include/rxgen960_config.h + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/i960/rxgen960/configure.ac b/c/src/lib/libbsp/i960/rxgen960/configure.ac index e08c6517de..5527146bcd 100644 --- a/c/src/lib/libbsp/i960/rxgen960/configure.ac +++ b/c/src/lib/libbsp/i960/rxgen960/configure.ac @@ -14,13 +14,10 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am deleted file mode 100644 index 1ae368ac05..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = rxgen960_config.h - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3