Revert Joel's 2008-01-31 screw up.

This commit is contained in:
Ralf Corsepius
2008-02-18 17:45:41 +00:00
parent b6d64cd3da
commit 7597fbf00c
2 changed files with 30 additions and 2 deletions

View File

@@ -8,10 +8,24 @@ endif
PREINSTALL_DIRS = PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS) DISTCLEANFILES = $(PREINSTALL_DIRS)
all-local: $(TMPINSTALL_FILES)
TMPINSTALL_FILES =
CLEANFILES = $(TMPINSTALL_FILES)
all-am: $(PREINSTALL_FILES) all-am: $(PREINSTALL_FILES)
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): $(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems

View File

@@ -8,10 +8,20 @@ endif
PREINSTALL_DIRS = PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS) DISTCLEANFILES = $(PREINSTALL_DIRS)
all-local: $(TMPINSTALL_FILES)
TMPINSTALL_FILES =
CLEANFILES = $(TMPINSTALL_FILES)
all-am: $(PREINSTALL_FILES) all-am: $(PREINSTALL_FILES)
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): $(PROJECT_INCLUDE)/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE) @$(MKDIR_P) $(PROJECT_INCLUDE)
@@ -19,6 +29,10 @@ $(PROJECT_INCLUDE)/$(dirstamp):
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
if LIBPOSIX 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 if HAS_PTHREADS
$(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h