From 5146f3d6911af03aae505211058518a2e5d2f53b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 10:42:18 +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/mvme147/ChangeLog | 7 +++++ c/src/lib/libbsp/m68k/mvme147/start/.cvsignore | 2 -- c/src/lib/libbsp/m68k/mvme147/start/Makefile.am | 33 --------------------- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 7 +++++ c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 21 +++++++++++--- c/src/lib/libbsp/m68k/mvme147s/configure.ac | 1 - c/src/lib/libbsp/m68k/mvme147s/start/.cvsignore | 2 -- c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am | 37 ------------------------ 8 files changed, 31 insertions(+), 79 deletions(-) delete mode 100644 c/src/lib/libbsp/m68k/mvme147/start/.cvsignore delete mode 100644 c/src/lib/libbsp/m68k/mvme147/start/Makefile.am delete mode 100644 c/src/lib/libbsp/m68k/mvme147s/start/.cvsignore delete mode 100644 c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 170b54fe0d..620afcd238 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -6,6 +6,13 @@ * start/Makefile.am: Ditto. * startup/Makefile.am: Ditto. +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/mvme147/start/.cvsignore b/c/src/lib/libbsp/m68k/mvme147/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am deleted file mode 100644 index 4568503d6d..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am +++ /dev/null @@ -1,33 +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 - -project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(TMPINSTALL_FILES) - -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/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 79080db8d5..f337341053 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/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-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 6f201fc72f..5a982f7282 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -4,23 +4,36 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + # 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 shmsupp wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock console timer shmsupp wrapup include_HEADERS += include/coverhd.h -all-local: $(PREINSTALL_FILES) +$(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 +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): $(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 = $(PREINSTALL_FILES) +CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac index d1b15116e5..83f4e03c7d 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac @@ -24,7 +24,6 @@ AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile shmsupp/Makefile -start/Makefile startup/Makefile timer/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme147s/start/.cvsignore b/c/src/lib/libbsp/m68k/mvme147s/start/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147s/start/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am deleted file mode 100644 index 6aeadcb7b6..0000000000 --- a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am +++ /dev/null @@ -1,37 +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) - -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