From 0724887fc299c86ac8346f3bd84009aa2e575997 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 14 Jan 2004 07:29:04 +0000 Subject: 2004-01-14 Ralf Corsepius * wrapup/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. Add PRE/TMPINSTALL_FILES to CLEANFILES. * automake/lib.am: Remove TMPINSTALL_FILES. --- c/src/ChangeLog | 6 ++++++ c/src/automake/lib.am | 2 -- c/src/wrapup/Makefile.am | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'c') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 4d5f64ca65..eeac7218f8 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2004-01-14 Ralf Corsepius + + * wrapup/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. + Add PRE/TMPINSTALL_FILES to CLEANFILES. + * automake/lib.am: Remove TMPINSTALL_FILES. + 2004-01-07 Joel Sherrill * aclocal/rtems-cpu-subdirs.m4: mips64orion port removed as mips port diff --git a/c/src/automake/lib.am b/c/src/automake/lib.am index 637694c84f..d910a8fbff 100644 --- a/c/src/automake/lib.am +++ b/c/src/automake/lib.am @@ -14,5 +14,3 @@ $(RM) $@ $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ endef - -TMPINSTALL_FILES = diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index e08d19e4e1..efc4769393 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -35,8 +35,7 @@ SRCS += ../libchip/network/$(ARCH)/libnetchip$(LIB_VARIANT).a endif endif -SRCS += $(wildcard \ - $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) +SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) if HAS_MP SRCS += ../libchip/shmdr/$(ARCH)/shmdr.rel @@ -72,12 +71,17 @@ $(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS) $(ARCH)/$(dirstamp) $(AR) rc $@ $(ARCH)/* $(RANLIB) $@ +TMPINSTALL_FILES = + $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a +CLEANFILES = $(TMPINSTALL_FILES) + include $(top_srcdir)/automake/local.am -- cgit v1.2.3