From d348010c03f9b397596a2dfab3e8e0cba8d9481c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 10:12:40 +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/arm/arm_bare_bsp/ChangeLog | 7 ++++++ c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am | 20 ++++++++++++++--- c/src/lib/libbsp/arm/arm_bare_bsp/configure.ac | 1 - .../libbsp/arm/arm_bare_bsp/include/Makefile.am | 25 ---------------------- c/src/lib/libbsp/arm/armulator/ChangeLog | 7 ++++++ c/src/lib/libbsp/arm/armulator/Makefile.am | 12 ++++++++--- c/src/lib/libbsp/arm/armulator/configure.ac | 1 - c/src/lib/libbsp/arm/armulator/include/Makefile.am | 22 ------------------- c/src/lib/libbsp/arm/edb7312/ChangeLog | 7 ++++++ c/src/lib/libbsp/arm/edb7312/Makefile.am | 18 +++++++++++++--- c/src/lib/libbsp/arm/edb7312/configure.ac | 1 - c/src/lib/libbsp/arm/edb7312/include/Makefile.am | 24 --------------------- c/src/lib/libbsp/arm/vegaplus/ChangeLog | 7 ++++++ c/src/lib/libbsp/arm/vegaplus/Makefile.am | 18 +++++++++++++--- c/src/lib/libbsp/arm/vegaplus/configure.ac | 3 --- c/src/lib/libbsp/arm/vegaplus/include/Makefile.am | 25 ---------------------- 16 files changed, 84 insertions(+), 114 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am delete mode 100644 c/src/lib/libbsp/arm/armulator/include/Makefile.am delete mode 100644 c/src/lib/libbsp/arm/edb7312/include/Makefile.am delete mode 100644 c/src/lib/libbsp/arm/vegaplus/include/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index b9288437f4..cacce26670 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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-17 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am index f2dd249169..206ed28433 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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 clock console startup start timer irq wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console startup start timer irq wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/registers.h + +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +noinst_HEADERS = include/bspio.h include/uart.h + +$(PROJECT_INCLUDE)/registers.h: include/registers.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/registers.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/arm/arm_bare_bsp/configure.ac b/c/src/lib/libbsp/arm/arm_bare_bsp/configure.ac index 54d1926e79..1002e6c705 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/configure.ac +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/configure.ac @@ -18,7 +18,6 @@ RTEMS_CANONICALIZE_TOOLS AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile irq/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am deleted file mode 100644 index b34ebf0958..0000000000 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h registers.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: $(TMPINSTALL_FILES) - -EXTRA_DIST = bspio.h bsp.h uart.h registers.h - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index 0413c0d032..a08b795829 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/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-17 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am index 1e26a4ca29..f2ebbf4283 100644 --- a/c/src/lib/libbsp/arm/armulator/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/Makefile.am @@ -5,12 +5,18 @@ 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 startup timer start wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console startup timer start wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(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/arm/armulator/configure.ac b/c/src/lib/libbsp/arm/armulator/configure.ac index fc6f31e65a..408bb600aa 100644 --- a/c/src/lib/libbsp/arm/armulator/configure.ac +++ b/c/src/lib/libbsp/arm/armulator/configure.ac @@ -33,7 +33,6 @@ RTEMS_BSPOPTS_HELP([ARM_RDP_MONITOR], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/arm/armulator/include/Makefile.am b/c/src/lib/libbsp/arm/armulator/include/Makefile.am deleted file mode 100644 index 7116f621b2..0000000000 --- a/c/src/lib/libbsp/arm/armulator/include/Makefile.am +++ /dev/null @@ -1,22 +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/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index c0c23885e6..6cae5c5c2d 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/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-17 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index b7fc207653..f3142a51dd 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -5,12 +5,24 @@ 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 startup timer start network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console irq startup timer start network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/ep7312.h + +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.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/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac index 9e4b96a0b0..aad8156bad 100644 --- a/c/src/lib/libbsp/arm/edb7312/configure.ac +++ b/c/src/lib/libbsp/arm/edb7312/configure.ac @@ -21,7 +21,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile irq/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/arm/edb7312/include/Makefile.am b/c/src/lib/libbsp/arm/edb7312/include/Makefile.am deleted file mode 100644 index 25d739c993..0000000000 --- a/c/src/lib/libbsp/arm/edb7312/include/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - -include_HEADERS = bsp.h coverhd.h bspopts.h ep7312.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 diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index 0c5a8560f8..81a9a7715e 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/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-17 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am index 8e69a7f791..ee43f72c82 100644 --- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/Makefile.am @@ -5,12 +5,24 @@ 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 irq clock console startup timer start wrapup +# from the individual .rel files built in other directories +SUBDIRS = . irq clock console startup timer start wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/registers.h + +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(PROJECT_INCLUDE)/registers.h: include/registers.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/registers.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/arm/vegaplus/configure.ac b/c/src/lib/libbsp/arm/vegaplus/configure.ac index c2c2709a7c..60c2a6fe3a 100644 --- a/c/src/lib/libbsp/arm/vegaplus/configure.ac +++ b/c/src/lib/libbsp/arm/vegaplus/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 irq/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am deleted file mode 100644 index 7988a10cf0..0000000000 --- a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h registers.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 -- cgit v1.2.3