summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-02-08 17:30:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-02-08 17:30:27 +0000
commit46f507f9c813b7c5afade111fd42f77bc8a80e2f (patch)
tree4f5a08926ee30fc93cb924c1ecba4c1c70d6d81c
parentAdd copy-on-write semantics to rtems_tarfs_load(). (diff)
downloadrtems-46f507f9c813b7c5afade111fd42f77bc8a80e2f.tar.bz2
Cosmetics.
-rw-r--r--cpukit/httpd/preinstall.am5
-rw-r--r--cpukit/itron/Makefile.am2
-rw-r--r--cpukit/libcsupport/Makefile.am2
-rw-r--r--cpukit/score/Makefile.am2
-rw-r--r--cpukit/wrapup/preinstall.am8
5 files changed, 13 insertions, 6 deletions
diff --git a/cpukit/httpd/preinstall.am b/cpukit/httpd/preinstall.am
index 87675f9299..154ec53fa5 100644
--- a/cpukit/httpd/preinstall.am
+++ b/cpukit/httpd/preinstall.am
@@ -62,6 +62,11 @@ $(PROJECT_INCLUDE)/goahead/wsIntrn.h: wsIntrn.h $(PROJECT_INCLUDE)/goahead/$(dir
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/wsIntrn.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h
+$(PROJECT_LIB)/$(dirstamp):
+ @$(mkdir_p) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
+
$(PROJECT_LIB)/libhttpd.a: libhttpd.a $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/libhttpd.a
TMPINSTALL_FILES += $(PROJECT_LIB)/libhttpd.a
diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am
index 948a5604ed..8da0e9def8 100644
--- a/cpukit/itron/Makefile.am
+++ b/cpukit/itron/Makefile.am
@@ -117,8 +117,6 @@ UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c \
EXTRA_DIST += $(UNUSED_C_FILES) src/TODO
-## PREINSTALLATION STUFF - Do not edit below
-
all-local: $(PREINSTALL_FILES)
include $(srcdir)/preinstall.am
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index ecbfe96183..83e59f9442 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -96,8 +96,6 @@ endif
EXTRA_DIST = src/TODO src/CASES src/README
-## PREINSTALLATION STUFF - Do not edit below
-
all-local: $(PREINSTALL_FILES)
include $(srcdir)/preinstall.am
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index cdd96c5f1c..2febb854e8 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -155,8 +155,6 @@ libscore_a_CPPFLAGS = $(AM_CPPFLAGS)
EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt
-all-local: $(PREINSTALL_FILES)
-
DISTCLEANFILES += include/rtems/score/cpuopts.h
all-local: $(PREINSTALL_FILES)
diff --git a/cpukit/wrapup/preinstall.am b/cpukit/wrapup/preinstall.am
index f188e83983..c446023471 100644
--- a/cpukit/wrapup/preinstall.am
+++ b/cpukit/wrapup/preinstall.am
@@ -5,9 +5,17 @@ $(srcdir)/preinstall.am: Makefile.am
$(top_srcdir)/ampolish3 $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
endif
+PREINSTALL_DIRS =
+DISTCLEANFILES += $(PREINSTALL_DIRS)
+
TMPINSTALL_FILES =
CLEANFILES += $(TMPINSTALL_FILES)
+$(PROJECT_LIB)/$(dirstamp):
+ @$(mkdir_p) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
+
$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a
TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu.a