diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-14 05:34:13 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-14 05:34:13 +0000 |
| commit | 7fc2cbfe36bd4a6e8a8c12326c118706fe99ef1b (patch) | |
| tree | 8888be4d9b3ad43b1f608d47962c2ff697851568 | |
| parent | 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7fc2cbfe36bd4a6e8a8c12326c118706fe99ef1b.tar.bz2 | |
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Remove $(ARCH)/$(dirstamp).
Add TMPINSTALL_FILES to CLEANFILES.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1c9b7d0655..cf94503b5b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * wrapup/Makefile.am: Remove $(ARCH)/$(dirstamp). + Add TMPINSTALL_FILES to CLEANFILES. + +2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: Re-add dirstamps to PREINSTALL_FILES. Add PREINSTALL_FILES to CLEANFILES. * automake/local.am: Remove depend-am. diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 9d878177f4..be148a0507 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -12,10 +12,6 @@ ARCH_DEBUG_V = o-debug ARCH__V = $(ARCH_OPTIMIZE_V) ARCH = $(ARCH_$(VARIANT_V)_V) -${ARCH}/$(dirstamp): - @$(mkdir_p) $(ARCH) - @: > $(ARCH)/$(dirstamp) - project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a CLEANFILES = o-optimize/librtemscpu.a CLEANFILES += o-debug/librtemscpu_g.a @@ -78,8 +74,9 @@ TMP_LIBS += ../librpc/librpc$(LIB_VARIANT).a TMP_LIBS += ../librpc/libxdr$(LIB_VARIANT).a endif -$(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS) $(ARCH)/$(dirstamp) +$(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS) rm -f $@ + $(mkdir_p) $(ARCH) rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel for f in $(TMP_LIBS); do \ case $$f in \ @@ -115,9 +112,12 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) @: > $(PROJECT_LIB)/$(dirstamp) +TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a +CLEANFILES += $(TMPINSTALL_FILES) + include $(top_srcdir)/automake/local.am |