From a692823e787f34cc6faf03bb604ae237afc04c02 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 12:23:14 +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/powerpc/dmv177/ChangeLog | 7 ++++ c/src/lib/libbsp/powerpc/dmv177/Makefile.am | 26 +++++++++++--- c/src/lib/libbsp/powerpc/dmv177/configure.ac | 1 - .../lib/libbsp/powerpc/dmv177/include/Makefile.am | 26 -------------- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 7 ++++ c/src/lib/libbsp/powerpc/eth_comm/Makefile.am | 40 ++++++++++++++++++++-- c/src/lib/libbsp/powerpc/eth_comm/configure.ac | 1 - .../libbsp/powerpc/eth_comm/include/Makefile.am | 30 ---------------- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 7 ++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 14 ++++++-- c/src/lib/libbsp/powerpc/gen405/configure.ac | 1 - .../lib/libbsp/powerpc/gen405/include/Makefile.am | 20 ----------- 12 files changed, 91 insertions(+), 89 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/gen405/include/Makefile.am (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index f25c6e0e14..4e6d259a01 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/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-19 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am index c6bd492750..8e3c295a94 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am @@ -5,13 +5,31 @@ 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 scv64 tod sonic \ - @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console startup start timer scv64 tod sonic @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = QUIRKS README.net STATUS bsp_specs cable.doc times +include_HEADERS += include/dmv170.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = QUIRKS README.net STATUS cable.doc times + +$(PROJECT_INCLUDE)/dmv170.h: include/dmv170.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/dmv170.h + +$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.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/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac index 22cc61258d..3a068f9548 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac @@ -50,7 +50,6 @@ RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile scv64/Makefile sonic/Makefile start/Makefile diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am deleted file mode 100644 index ae5f9618ef..0000000000 --- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h dmv170.h tod.h bspopts.h - -tod.h: $(top_srcdir)/../../shared/tod.h - cp $< $@ -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = tod.h 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/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index b8ce6a085e..03fbe33bfe 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/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-19 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index 3dc44fc46c..cbe88186ad 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am @@ -5,13 +5,47 @@ 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 = clock include startup start canbus console irq network vectors \ +# from the individual .rel files built in other directories +SUBDIRS = . clock startup start canbus console irq network vectors \ @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +include_bspdir = $(includedir)/bsp + +include_HEADERS += include/coverhd.h +include_HEADERS += include/canbus.h +include_HEADERS += include/info.h +include_bsp_HEADERS = include/commproc.h +include_bsp_HEADERS += include/8xx_immap.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(PROJECT_INCLUDE)/bsp: + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp + +$(PROJECT_INCLUDE)/bsp/commproc.h: include/commproc.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/commproc.h + +$(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/canbus.h: include/canbus.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/canbus.h + +$(PROJECT_INCLUDE)/info.h: include/info.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/info.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac index 7766799ef5..8f8ffa3d56 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac @@ -41,7 +41,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile canbus/Makefile console/Makefile -include/Makefile irq/Makefile network/Makefile start/Makefile diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am deleted file mode 100644 index a6315af40a..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - - -include_bspdir = $(includedir)/bsp - -include_HEADERS = bsp.h coverhd.h canbus.h info.h bspopts.h -include_bsp_HEADERS = commproc.h 8xx_immap.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - - $(PROJECT_INCLUDE)/bsp/%.h : %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index f155cfb425..39fa051303 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/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-19 Ralf Corsepius * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 698cf52127..028d24b726 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/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 dlentry startup @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . dlentry startup @exceptions@ 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/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index 2622d82972..0db7f0bba2 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile dlentry/Makefile -include/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am +++ /dev/null @@ -1,20 +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/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3