From 82a7f58038fb9d7eb897241bd2d8ea6ecac5a05b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 09:56:23 +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/or32/orp/ChangeLog | 7 +++++++ c/src/lib/libbsp/or32/orp/Makefile.am | 12 +++++++++--- c/src/lib/libbsp/or32/orp/configure.ac | 1 - c/src/lib/libbsp/or32/orp/include/Makefile.am | 22 ---------------------- c/src/lib/libbsp/sparc/erc32/ChangeLog | 7 +++++++ c/src/lib/libbsp/sparc/erc32/Makefile.am | 16 ++++++++++++---- c/src/lib/libbsp/sparc/erc32/configure.ac | 1 - c/src/lib/libbsp/sparc/erc32/include/Makefile.am | 19 ------------------- c/src/lib/libbsp/sparc/leon/ChangeLog | 7 +++++++ c/src/lib/libbsp/sparc/leon/Makefile.am | 16 ++++++++++++---- c/src/lib/libbsp/sparc/leon/configure.ac | 1 - c/src/lib/libbsp/sparc/leon/include/Makefile.am | 18 ------------------ c/src/lib/libbsp/unix/posix/ChangeLog | 7 +++++++ c/src/lib/libbsp/unix/posix/Makefile.am | 14 +++++++++++--- c/src/lib/libbsp/unix/posix/configure.ac | 1 - c/src/lib/libbsp/unix/posix/include/Makefile.am | 22 ---------------------- 16 files changed, 72 insertions(+), 99 deletions(-) delete mode 100644 c/src/lib/libbsp/or32/orp/include/Makefile.am delete mode 100644 c/src/lib/libbsp/sparc/erc32/include/Makefile.am delete mode 100644 c/src/lib/libbsp/sparc/leon/include/Makefile.am delete mode 100644 c/src/lib/libbsp/unix/posix/include/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/or32/orp/ChangeLog b/c/src/lib/libbsp/or32/orp/ChangeLog index af0958826e..9436dd500c 100644 --- a/c/src/lib/libbsp/or32/orp/ChangeLog +++ b/c/src/lib/libbsp/or32/orp/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-08 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/or32/orp/Makefile.am b/c/src/lib/libbsp/or32/orp/Makefile.am index 1e26a4ca29..e4055306e1 100644 --- a/c/src/lib/libbsp/or32/orp/Makefile.am +++ b/c/src/lib/libbsp/or32/orp/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 +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(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/or32/orp/configure.ac b/c/src/lib/libbsp/or32/orp/configure.ac index 328a47c067..d9152d1a06 100644 --- a/c/src/lib/libbsp/or32/orp/configure.ac +++ b/c/src/lib/libbsp/or32/orp/configure.ac @@ -18,7 +18,6 @@ RTEMS_CANONICALIZE_TOOLS AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/or32/orp/include/Makefile.am b/c/src/lib/libbsp/or32/orp/include/Makefile.am deleted file mode 100644 index 7116f621b2..0000000000 --- a/c/src/lib/libbsp/or32/orp/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/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index 5b2fa3046b..9855d6013d 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/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-08 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 0cbe8e940d..2b1ba36cfc 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -5,13 +5,21 @@ 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 gnatsupp console clock timer erc32sonic \ - wrapup tools +# from the individual .rel files built in other directories +SUBDIRS = . start startup gnatsupp console clock timer erc32sonic wrapup \ + tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/erc32.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/erc32.h: include/erc32.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/erc32/configure.ac b/c/src/lib/libbsp/sparc/erc32/configure.ac index 584cef706e..3584a71d64 100644 --- a/c/src/lib/libbsp/sparc/erc32/configure.ac +++ b/c/src/lib/libbsp/sparc/erc32/configure.ac @@ -42,7 +42,6 @@ clock/Makefile console/Makefile erc32sonic/Makefile gnatsupp/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am deleted file mode 100644 index d95497c604..0000000000 --- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h erc32.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index 0472adbfbb..81c38d96b3 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/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-08 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am index 08a833f08e..b0159b6d68 100644 --- a/c/src/lib/libbsp/sparc/leon/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon/Makefile.am @@ -5,13 +5,21 @@ 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 gnatsupp console clock timer \ - leon_open_eth wrapup tools +# from the individual .rel files built in other directories +SUBDIRS = . start startup gnatsupp console clock timer leon_open_eth wrapup \ + tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_HEADERS += include/leon.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/leon.h: include/leon.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/leon/configure.ac b/c/src/lib/libbsp/sparc/leon/configure.ac index dbc2f7ec0b..a00c24c6be 100644 --- a/c/src/lib/libbsp/sparc/leon/configure.ac +++ b/c/src/lib/libbsp/sparc/leon/configure.ac @@ -42,7 +42,6 @@ clock/Makefile console/Makefile leon_open_eth/Makefile gnatsupp/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/sparc/leon/include/Makefile.am b/c/src/lib/libbsp/sparc/leon/include/Makefile.am deleted file mode 100644 index bb045b8560..0000000000 --- a/c/src/lib/libbsp/sparc/leon/include/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h leon.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -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/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index e6ff8dbfbb..a30eb0815f 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/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-26 Joel Sherrill * timer/timer.c: Obsoleting HP PA-RISC port and removing all diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index 4d42be5962..32ab1683ca 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/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 startup clock console timer shmsupp wrapup tools +# from the individual .rel files built in other directories +SUBDIRS = . startup clock console timer shmsupp wrapup tools 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/unix/posix/configure.ac b/c/src/lib/libbsp/unix/posix/configure.ac index 65b79df86d..a8c0c1fc44 100644 --- a/c/src/lib/libbsp/unix/posix/configure.ac +++ b/c/src/lib/libbsp/unix/posix/configure.ac @@ -40,7 +40,6 @@ RTEMS_BSPOPTS_HELP([HEAPSPACE_MB], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.am b/c/src/lib/libbsp/unix/posix/include/Makefile.am deleted file mode 100644 index ec3e63c3a0..0000000000 --- a/c/src/lib/libbsp/unix/posix/include/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h bspopts.h coverhd.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 -- cgit v1.2.3