From db0b36999d611a0e4b555cde9dc3210e41d5e1bc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 13:11:22 +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/helas403/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/helas403/Makefile.am | 21 +++++++++---- c/src/lib/libbsp/powerpc/helas403/configure.ac | 1 - .../libbsp/powerpc/helas403/include/Makefile.am | 20 ------------- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 35 +++++++++++++++++++--- c/src/lib/libbsp/powerpc/mbx8xx/configure.ac | 1 - .../lib/libbsp/powerpc/mbx8xx/include/Makefile.am | 30 ------------------- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 16 +++++++--- c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac | 1 - .../libbsp/powerpc/mpc8260ads/include/Makefile.am | 24 --------------- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 30 ++++++++++++++++--- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 1 - .../libbsp/powerpc/ppcn_60x/include/Makefile.am | 23 -------------- c/src/lib/libbsp/powerpc/psim/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/psim/Makefile.am | 15 ++++++---- c/src/lib/libbsp/powerpc/psim/configure.ac | 1 - c/src/lib/libbsp/powerpc/psim/include/Makefile.am | 20 ------------- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 7 +++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 21 +++++++++++-- c/src/lib/libbsp/powerpc/score603e/configure.ac | 1 - .../libbsp/powerpc/score603e/include/Makefile.am | 20 ------------- 24 files changed, 154 insertions(+), 169 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/helas403/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/include/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/include/Makefile.am (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index f58f9db2e1..1955d04110 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/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-04 Joel Sherrill * include/bsp.h, include/coverhd.h, startup/bspclean.c, diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index 21ffb29a12..634d46a9f4 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -5,17 +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 dlentry flashentry startup @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . dlentry flashentry startup @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -$(PROJECT_RELEASE)/lib/bsp_specs.dl: bsp_specs.dl - $(INSTALL_DATA) $< $@ +dist_bsplib_DATA += bsp_specs.dl + +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) -PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/bsp_specs.dl +EXTRA_DIST = times -EXTRA_DIST = bsp_specs bsp_specs.dl times +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl: bsp_specs.dl + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.ac b/c/src/lib/libbsp/powerpc/helas403/configure.ac index d73d6e97a7..1f5b7513df 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.ac +++ b/c/src/lib/libbsp/powerpc/helas403/configure.ac @@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], AC_CONFIG_FILES([Makefile dlentry/Makefile flashentry/Makefile -include/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/helas403/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 diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index ee3be4e5b4..4692e6821b 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/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-04 Joel Sherrill * clock/p_clock.c, ide/pcmcia_ide.c, include/bsp.h, include/coverhd.h, diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index f974df1642..a91cf18c7e 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -5,13 +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 clock console irq network ide startup vectors \ - @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console irq network ide startup vectors @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = README bsp_specs times +include_bspdir = $(includedir)/bsp + +include_HEADERS += include/coverhd.h +include_bsp_HEADERS = include/mbx.h include/commproc.h 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/mbx.h: include/mbx.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mbx.h + +$(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 include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac index cf0eb1b34c..ef4b32a690 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac +++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac @@ -120,7 +120,6 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile irq/Makefile ide/Makefile network/Makefile diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am deleted file mode 100644 index 712cebaa6f..0000000000 --- a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - - -include_bspdir = $(includedir)/bsp - -include_HEADERS = bsp.h coverhd.h bspopts.h -include_bsp_HEADERS = mbx.h 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/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 1a35f583fc..1819938a4a 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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-04 Joel Sherrill * clock/p_clock.c, include/bsp.h, include/coverhd.h, irq/irq.c, diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index b097132490..15304e0dae 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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 clock console vectors irq network start startup \ - @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console vectors irq network start startup @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = README 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/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index 87137f22c5..9e27515f5e 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -71,7 +71,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile irq/Makefile vectors/Makefile diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am deleted file mode 100644 index a4929c9139..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h bspopts.h coverhd.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.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/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 07914a1bbf..46c01b5d6d 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index f088c59c23..88a61e884a 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -5,13 +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 clock console startup start timer tod network universe pci \ - nvram vectors @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console startup start timer tod network universe pci nvram \ + vectors @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = STATUS bsp_specs +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +include_HEADERS += include/tod.h +include_HEADERS += include/nvram.h include/pci.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = STATUS + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/tod.h: include/tod.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h + +$(PROJECT_INCLUDE)/nvram.h: include/nvram.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h + +$(PROJECT_INCLUDE)/pci.h: include/pci.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index d382db426f..1ea6e87f52 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -63,7 +63,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile network/Makefile nvram/Makefile pci/Makefile diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am deleted file mode 100644 index 59af5bb395..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h tod.h nvram.h pci.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/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index f8d98f066c..f8d24e3373 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index f05e968e55..8292a61a0c 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -5,14 +5,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 clock console startup shmsupp timer vectors \ - @exceptions@ wrapup \ - tools +# from the individual .rel files built in other directories +SUBDIRS = . start clock console startup shmsupp timer vectors @exceptions@ \ + wrapup tools 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/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index bca3f1820a..7f2f7362ba 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -37,7 +37,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/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 diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 95a58e182b..56329fd408 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/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/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 6551594897..5c54ab6d1d 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -5,13 +5,28 @@ 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 tod PCI_bus vectors \ +# from the individual .rel files built in other directories +SUBDIRS = . clock console startup start timer tod PCI_bus vectors \ @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/coverhd.h include/gen2.h +include_HEADERS += include/tod.h + +all-local: $(PREINSTALL_FILES) + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_INCLUDE)/gen2.h: include/gen2.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/gen2.h + +$(PROJECT_INCLUDE)/tod.h: include/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/powerpc/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index 1293156f69..c0ab5f5943 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -73,7 +73,6 @@ AC_CONFIG_FILES([Makefile PCI_bus/Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am deleted file mode 100644 index 983a64ae8a..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h gen2.h tod.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