diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-02-18 17:45:41 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-02-18 17:45:41 +0000 |
commit | 7597fbf00c4438ab04bf1edfa886ac1d1cfea759 (patch) | |
tree | 77b626f768b1067588515280c339f13d1b0b356e | |
parent | This commit was generated by cvs2svn to compensate for changes in r16912, (diff) | |
download | rtems-7597fbf00c4438ab04bf1edfa886ac1d1cfea759.tar.bz2 |
Revert Joel's 2008-01-31 screw up.
-rw-r--r-- | cpukit/libcsupport/preinstall.am | 16 | ||||
-rw-r--r-- | cpukit/posix/preinstall.am | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am index 80443d7011..cccde53bc0 100644 --- a/cpukit/libcsupport/preinstall.am +++ b/cpukit/libcsupport/preinstall.am @@ -8,10 +8,24 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) +all-local: $(TMPINSTALL_FILES) + +TMPINSTALL_FILES = +CLEANFILES = $(TMPINSTALL_FILES) + all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) + +$(PROJECT_LIB)/$(dirstamp): + @$(MKDIR_P) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) + +$(PROJECT_LIB)/libcsupport.a: libcsupport.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libcsupport.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libcsupport.a $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am index eae3fa7ab7..1c484fbf8b 100644 --- a/cpukit/posix/preinstall.am +++ b/cpukit/posix/preinstall.am @@ -8,10 +8,20 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) +all-local: $(TMPINSTALL_FILES) + +TMPINSTALL_FILES = +CLEANFILES = $(TMPINSTALL_FILES) + all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) + +$(PROJECT_LIB)/$(dirstamp): + @$(MKDIR_P) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_INCLUDE)/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE) @@ -19,6 +29,10 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) if LIBPOSIX +$(PROJECT_LIB)/libposix.a: libposix.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libposix.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libposix.a + if HAS_PTHREADS $(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h |