diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:11:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:11:26 +0000 |
| commit | 2821666fa1d31c1fc6f65690a0bc57618d9f4a81 (patch) | |
| tree | e13d8b9e6f35569eb3e900a1c4940a7895d4ee6b /c/src/lib/libbsp/m68k | |
| parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-2821666fa1d31c1fc6f65690a0bc57618d9f4a81.tar.bz2 | |
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
Reflect changes to bsp.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
52 files changed, 336 insertions, 350 deletions
diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog index ad9cea302e..1e641ac788 100644 --- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/efi68k/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/Makefile.am index 97b2304596..653f90480e 100644 --- a/c/src/lib/libbsp/m68k/efi68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/Makefile.am @@ -5,12 +5,35 @@ 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 spurious timer wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console spurious timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +include_HEADERS += include/efi68k.h +include_HEADERS += include/16550.h +include_HEADERS += include/DP8570A.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 + +$(PROJECT_INCLUDE)/efi68k.h: include/efi68k.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/efi68k.h + +$(PROJECT_INCLUDE)/16550.h: include/16550.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/16550.h + +$(PROJECT_INCLUDE)/DP8570A.h: include/DP8570A.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/DP8570A.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/efi68k/configure.ac b/c/src/lib/libbsp/m68k/efi68k/configure.ac index 3e24033325..6d3e4cc6aa 100644 --- a/c/src/lib/libbsp/m68k/efi68k/configure.ac +++ b/c/src/lib/libbsp/m68k/efi68k/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 spurious/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am deleted file mode 100644 index 2b0ef2bccc..0000000000 --- a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h efi68k.h 16550.h DP8570A.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ -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/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index b8f90e68ba..254f351d03 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 194937cb2a..3c1c64f5e4 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -5,12 +5,25 @@ 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 network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h +include_HEADERS += include/m302_int.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/m302_int.h: include/m302_int.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m302_int.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68302/configure.ac b/c/src/lib/libbsp/m68k/gen68302/configure.ac index a3698621f0..c41bad1053 100644 --- a/c/src/lib/libbsp/m68k/gen68302/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68302/configure.ac @@ -18,12 +18,10 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am deleted file mode 100644 index 8de9305e98..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h m302_int.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 6734017a17..85a49febc7 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index a04fca02c0..698e4faf69 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -5,12 +5,45 @@ 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 +include_HEADERS += include/coverhd.h +include_HEADERS += include/m340uart.h +include_HEADERS += include/m340timer.h +include_HEADERS += include/m68340.h +include_HEADERS += include/m68340.inc +include_HEADERS += include/m68349.inc + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/m340uart.h: include/m340uart.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340uart.h + +$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340timer.h + +$(PROJECT_INCLUDE)/m68340.h: include/m68340.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.h + +$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.inc + +$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac index d4937083b2..e6e0e40595 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/gen68340/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am deleted file mode 100644 index c5f24080e9..0000000000 --- a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h m340uart.h m340timer.h m68340.h m68340.inc \ - bspopts.h m68349.inc - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/%.inc: %.inc - $(INSTALL_DATA) $< $@ - -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/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 1ffb84dbd9..b3bd5471d8 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 194937cb2a..0e0a3a5e30 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/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 network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(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/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac index ad7049a9a8..e16477c406 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac @@ -18,12 +18,10 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.am deleted file mode 100644 index ee2cf9a04b..0000000000 --- a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index ec4b81904a..77f7daa9b3 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index a04fca02c0..8cd747777c 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -5,12 +5,26 @@ 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 +include_HEADERS += include/leds.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = include/README +EXTRA_DIST += times + +$(PROJECT_INCLUDE)/leds.h: include/leds.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/leds.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/m68k/idp/configure.ac b/c/src/lib/libbsp/m68k/idp/configure.ac index 57f32b9e47..53f32b61a9 100644 --- a/c/src/lib/libbsp/m68k/idp/configure.ac +++ b/c/src/lib/libbsp/m68k/idp/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/m68k/idp/include/Makefile.am b/c/src/lib/libbsp/m68k/idp/include/Makefile.am deleted file mode 100644 index 0fe9cf426c..0000000000 --- a/c/src/lib/libbsp/m68k/idp/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h leds.h bspopts.h - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -CLEANFILES = coverhd.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = README - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 231cdbdb16..796e0f22d4 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * 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 <joel@OARcorp.com> * README, console/console.c, i2c/i2c.c, i2c/i2cdrv.c, include/bsp.h, diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index c1acec9e91..b49040dfb5 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -5,14 +5,46 @@ 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 console i2c \ - tod nvram tools wrapup +SUBDIRS = . start startup console i2c tod nvram tools wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times README +include_HEADERS += include/coverhd.h +include_HEADERS += include/i2c.h +include_HEADERS += include/i2cdrv.h +include_HEADERS += include/ds1307.h +include_HEADERS += include/nvram.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/i2c.h: include/i2c.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h + +$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h + +$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h + +$(PROJECT_INCLUDE)/nvram.h: include/nvram.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h + +$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac index bb4de97493..f48c8525da 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5206elite/configure.ac @@ -16,13 +16,10 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NETWORKING - AC_CONFIG_SUBDIRS(tools) - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -include/Makefile start/Makefile startup/Makefile console/Makefile diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/include/Makefile.am deleted file mode 100644 index b4464f9a40..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h i2c.h \ - i2cdrv.h ds1307.h nvram.h \ - tod.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -tod.h: $(top_srcdir)/../../shared/tod.h - cp $< $@ -CLEANFILES = tod.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 81f5a6b9da..c4d61dc11a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 97b2304596..c7c2a6cf88 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -6,11 +6,16 @@ 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 spurious timer wrapup +SUBDIRS = . start startup clock console spurious timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/mrm332.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREIINSTALL_FILES) + +EXTRA_DIST = times include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index fa76cf6aad..bf47c16990 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -14,13 +14,10 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile spurious/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am deleted file mode 100644 index bad922448a..0000000000 --- a/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h mrm332.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ - -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/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index de339f7999..ae3beb18af 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index a04fca02c0..2f83b3e62e 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -6,11 +6,15 @@ 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 +SUBDIRS = . start startup clock console timer wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac index 32a36c4bab..62d1ad8181 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147/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/m68k/mvme147/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/include/Makefile.am deleted file mode 100644 index ee2cf9a04b..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 6e468ec2a6..b1734edc66 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 6c7baef5bd..6fdc25b060 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/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 shmsupp wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer shmsupp wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(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/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac index 166cf58f0f..71e0481d57 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac @@ -23,7 +23,6 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am deleted file mode 100644 index ee2cf9a04b..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index b3b348d409..0e591ab173 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 2c55209d1c..e600576604 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -14,11 +14,19 @@ 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 tod network wrapup tools +SUBDIRS = . start startup clock console timer tod network wrapup tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/coverhd.h +include_HEADERS += include/page_table.h +include_HEADERS += include/tod.h + +nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/include/mvme16x_hw.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index d6e3277cf0..d416ce08d9 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -24,7 +24,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am deleted file mode 100644 index 18d19ddfd8..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h tod.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-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am 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 <corsepiu@faw.uni-ulm.de> + + * 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 <joel@OARcorp.com> * 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 diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 2dcf69ca26..10ddc8d84a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index a04fca02c0..5c95ecd31f 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -5,12 +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 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 +include_HEADERS += include/bare.h +include_HEADERS += include/crc.h +include_HEADERS += include/debugport.h +include_HEADERS += include/m68302scc.h +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/bare.h: include/bare.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bare.h + +$(PROJECT_INCLUDE)/crc.h: include/crc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/crc.h + +$(PROJECT_INCLUDE)/debugport.h: include/debugport.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/debugport.h + +$(PROJECT_INCLUDE)/m68302scc.h: include/m68302scc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68302scc.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/m68k/ods68302/configure.ac b/c/src/lib/libbsp/m68k/ods68302/configure.ac index 0e95c8b59b..8f5fe9e851 100644 --- a/c/src/lib/libbsp/m68k/ods68302/configure.ac +++ b/c/src/lib/libbsp/m68k/ods68302/configure.ac @@ -35,7 +35,6 @@ AM_CONDITIONAL(ODS68302_DEBUG,[test "$ODS68302_DEBUG" = "yes"]) AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am deleted file mode 100644 index 07266e4b2c..0000000000 --- a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 2272754e7b..ef070b16db 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index b17ebea158..8266588bbe 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/configure.ac b/c/src/lib/libbsp/m68k/sim68000/configure.ac index 5e1c47a8df..1173f39ad2 100644 --- a/c/src/lib/libbsp/m68k/sim68000/configure.ac +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/include/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am deleted file mode 100644 index 93032ddb1b..0000000000 --- a/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ - -CLEANFILES = coverhd.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am |