From d5f913838ed49a59d365e166efd6be9c1c15905a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 07:09:17 +0000 Subject: 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. Add PRE/TMPINSTALL_FILES to CLEANFILES. * configure.ac: Ditto. * start/Makefile.am: Ditto. * startup/Makefile.am: Ditto. --- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/mvme147/Makefile.am | 23 +++++++++++++++++++---- c/src/lib/libbsp/m68k/mvme147/configure.ac | 1 - c/src/lib/libbsp/m68k/mvme147/start/Makefile.am | 5 +++++ c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am | 5 +++++ 5 files changed, 37 insertions(+), 5 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index eb897c55f1..170b54fe0d 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,11 @@ +2004-01-14 Ralf Corsepius + + * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + * configure.ac: Ditto. + * start/Makefile.am: Ditto. + * startup/Makefile.am: Ditto. + 2004-01-05 Ralf Corsepius * wrapup/Makefile.am: Eliminate $(LIB). diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index fde4b0aeb1..aeac766cc9 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -4,21 +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 wrapup - -include $(top_srcdir)/../../bsp.am +SUBDIRS = . startup clock console timer 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/mvme147/configure.ac b/c/src/lib/libbsp/m68k/mvme147/configure.ac index 36c12b39c2..7c3502a092 100644 --- a/c/src/lib/libbsp/m68k/mvme147/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme147/configure.ac @@ -18,7 +18,6 @@ RTEMS_CANONICALIZE_TOOLS AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -start/Makefile startup/Makefile timer/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am index 095bb84483..4568503d6d 100644 --- a/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/start/Makefile.am @@ -17,12 +17,17 @@ 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/mvme147/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am index 1a57b2f0b3..af467a903d 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am @@ -30,12 +30,17 @@ all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c linkcmds +TMPINSTALL_FILES = + $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds +CLEANFILES = $(TMPINSTALL_FILES) + include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3