From 2d86d78f965efaee5832e1d4bff1754085baae8f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 01:30:31 +0000 Subject: 2004-01-14 Ralf Corsepius * start/.cvsignore: Remove. * start/Makefile.am: Remove. * Makefile.am: Merge-in start/Makefile.am. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 7 ++++++ c/src/lib/libbsp/m68k/mvme162/Makefile.am | 19 +++++++++++---- c/src/lib/libbsp/m68k/mvme162/configure.ac | 1 - c/src/lib/libbsp/m68k/mvme162/start/.cvsignore | 2 -- c/src/lib/libbsp/m68k/mvme162/start/Makefile.am | 32 ------------------------- 5 files changed, 22 insertions(+), 39 deletions(-) delete mode 100644 c/src/lib/libbsp/m68k/mvme162/start/.cvsignore delete mode 100644 c/src/lib/libbsp/m68k/mvme162/start/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 00bac271f1..4eec2fbb78 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,10 @@ +2004-01-14 Ralf Corsepius + + * start/.cvsignore: Remove. + * start/Makefile.am: Remove. + * Makefile.am: Merge-in start/Makefile.am. + * configure.ac: Reflect changes above. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 90d078c506..82b4df11b4 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -4,6 +4,9 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + # consolex is a predecessor of the termios and libchip concepts. # It is no longer being compiled into the source. # The MVME162 has 2 z8530's to yield four serial ports. @@ -14,9 +17,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 = . start startup clock console timer tod network wrapup tools - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock console timer tod network wrapup tools include_HEADERS += include/coverhd.h include_HEADERS += include/page_table.h @@ -24,7 +25,13 @@ include_HEADERS += include/tod.h nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h -all-local: $(PREINSTALL_FILES) +m68k_shared_S_FILES = $(top_srcdir)/../../m68k/shared/start.S +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): $(top_srcdir)/../../m68k/shared/start.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< + +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) + +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times @@ -44,5 +51,9 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h +$(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) + include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index 634d691f6f..86cca0238e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -25,7 +25,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile network/Makefile -start/Makefile startup/Makefile timer/Makefile tod/Makefile diff --git a/c/src/lib/libbsp/m68k/mvme162/start/.cvsignore b/c/src/lib/libbsp/m68k/mvme162/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am deleted file mode 100644 index 992dd4f24d..0000000000 --- a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -VPATH = @srcdir@:@srcdir@/../../shared - -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) - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(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) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3