From ad1abd3e361c06f47dbd62b0c0a3c7f86eaf2415 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 13:27:37 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in start/Makefile.am. * start/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/dmv177/Makefile.am | 33 +++++++++++++------ c/src/lib/libbsp/powerpc/dmv177/configure.ac | 1 - c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore | 2 -- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/eth_comm/Makefile.am | 26 ++++++++++++--- c/src/lib/libbsp/powerpc/eth_comm/configure.ac | 1 - c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore | 2 -- .../lib/libbsp/powerpc/eth_comm/start/Makefile.am | 37 ---------------------- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 14 ++++++-- c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac | 1 - .../lib/libbsp/powerpc/mpc8260ads/start/.cvsignore | 2 -- .../libbsp/powerpc/mpc8260ads/start/Makefile.am | 37 ---------------------- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 13 +++++++- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 1 - c/src/lib/libbsp/powerpc/ppcn_60x/start/.cvsignore | 2 -- .../lib/libbsp/powerpc/ppcn_60x/start/Makefile.am | 31 ------------------ c/src/lib/libbsp/powerpc/psim/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/psim/Makefile.am | 15 +++++++-- c/src/lib/libbsp/powerpc/psim/configure.ac | 1 - c/src/lib/libbsp/powerpc/psim/start/.cvsignore | 2 -- c/src/lib/libbsp/powerpc/psim/start/Makefile.am | 37 ---------------------- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 6 ++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 15 +++++++-- c/src/lib/libbsp/powerpc/score603e/configure.ac | 1 - .../lib/libbsp/powerpc/score603e/start/.cvsignore | 2 -- .../lib/libbsp/powerpc/score603e/start/Makefile.am | 31 ------------------ 29 files changed, 131 insertions(+), 212 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/start/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/psim/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/psim/start/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/start/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/start/Makefile.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index 52a5d1b9e8..ddd21190d1 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am index 48bed8780e..8c29328763 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am @@ -6,35 +6,50 @@ 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 console startup start timer scv64 tod sonic @exceptions@ \ - wrapup +SUBDIRS = . clock console startup timer scv64 tod sonic @exceptions@ wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_HEADERS += include/dmv170.h -nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h -nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h +nodist_include_HEADERS += ../../shared/tod.h +nodist_include_HEADERS += ../../shared/include/coverhd.h + +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) -all-local: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -EXTRA_DIST = QUIRKS README.net STATUS cable.doc times +EXTRA_DIST += QUIRKS README.net STATUS cable.doc times PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/dmv170.h: include/dmv170.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dmv170.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/dmv170.h -$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 20395d1b53..9be7a64ceb 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac @@ -53,7 +53,6 @@ clock/Makefile console/Makefile scv64/Makefile sonic/Makefile -start/Makefile startup/Makefile timer/Makefile tod/Makefile diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore b/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 6ab206b62f..c4222be223 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index 51d81d5a33..d8980f6b87 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am @@ -6,21 +6,32 @@ 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 startup start canbus console irq network vectors \ - @exceptions@ wrapup +SUBDIRS = . clock startup canbus console irq network vectors @exceptions@ \ + wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_bspdir = $(includedir)/bsp include_HEADERS += include/coverhd.h include/canbus.h include/info.h include_bsp_HEADERS = include/commproc.h include/8xx_immap.h -all-local: $(PREINSTALL_FILES) +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -EXTRA_DIST = times +EXTRA_DIST += times PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @@ -47,8 +58,13 @@ $(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/8xx_immap.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h -CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 7aa4ce700d..bbe5c582ab 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac @@ -44,7 +44,6 @@ canbus/Makefile console/Makefile irq/Makefile network/Makefile -start/Makefile startup/Makefile vectors/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -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 3fc366da0d..b234fe5151 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 9b214f2869..f7d3f333dd 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -6,25 +6,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 = . clock console vectors irq network start startup @exceptions@ \ - wrapup +SUBDIRS = . clock console vectors irq network startup @exceptions@ wrapup include $(top_srcdir)/../../bsp.am include_HEADERS += include/coverhd.h +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + all-local: $(PREINSTALL_FILES) EXTRA_DIST = times PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 86a2691ccb..9ab87155e1 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -75,7 +75,6 @@ console/Makefile network/Makefile irq/Makefile vectors/Makefile -start/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -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 bcbbac0585..295deb0d06 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 042edf700d..9997b5a791 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -6,7 +6,7 @@ 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 console startup start timer tod network universe pci nvram \ +SUBDIRS = . clock console startup timer tod network universe pci nvram \ vectors @exceptions@ wrapup include $(top_srcdir)/../../bsp.am @@ -15,11 +15,17 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h include_HEADERS += include/tod.h include_HEADERS += include/nvram.h include/pci.h +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + all-local: $(PREINSTALL_FILES) EXTRA_DIST = STATUS PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h @@ -37,8 +43,13 @@ $(PROJECT_INCLUDE)/pci.h: include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 8310c80b2d..77cd72e1aa 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -67,7 +67,6 @@ console/Makefile network/Makefile nvram/Makefile pci/Makefile -start/Makefile startup/Makefile timer/Makefile tod/Makefile diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am deleted file mode 100644 index d4a2c8a992..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -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 bfcab8466e..1cef479142 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 85ad64ccd2..2511e7f146 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -6,23 +6,34 @@ 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 = . start clock console startup shmsupp timer vectors @exceptions@ \ - wrapup tools +SUBDIRS = . clock console startup shmsupp timer vectors @exceptions@ wrapup \ + tools include $(top_srcdir)/../../bsp.am include_HEADERS += include/coverhd.h +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 3b05b1a6d1..347443737d 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -39,7 +39,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile shmsupp/Makefile -start/Makefile startup/Makefile timer/Makefile vectors/Makefile diff --git a/c/src/lib/libbsp/powerpc/psim/start/.cvsignore b/c/src/lib/libbsp/powerpc/psim/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/start/Makefile.am b/c/src/lib/libbsp/powerpc/psim/start/Makefile.am deleted file mode 100644 index 8e096cebcd..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/start/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -# -# (OPTIONAL) Add local stuff here using += -# - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -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 7780b4891c..f1e2b57177 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in start/Makefile.am. + * start/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-28 Ralf Corsepius * configure.ac: Add nostdinc to AUTOMAKE_OPTIONS. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 492a61ac92..0fe9b21907 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -6,17 +6,23 @@ 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 console startup start timer tod PCI_bus vectors \ - @exceptions@ wrapup +SUBDIRS = . clock console startup timer tod PCI_bus vectors @exceptions@ \ + wrapup include $(top_srcdir)/../../bsp.am include_HEADERS += include/coverhd.h include/gen2.h include_HEADERS += include/tod.h +EXTRA_DIST = start/start.S +start$(LIB_VARIANT).$(OBJEXT): start/start.S + ${CCASCOMPILE} -DASM -o $@ -c $< +project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) + all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h @@ -30,8 +36,13 @@ $(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) + CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES += $(TMPINSTALL_FILES) 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 44a322b8cf..f0ab5bda7f 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -74,7 +74,6 @@ AC_CONFIG_FILES([Makefile PCI_bus/Makefile clock/Makefile console/Makefile -start/Makefile startup/Makefile timer/Makefile tod/Makefile diff --git a/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am deleted file mode 100644 index d4a2c8a992..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -S_FILES = start.S -OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am -include $(top_srcdir)/../../bspstart.am - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = start.S - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3