2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
	Add PREINSTALL_FILES to CLEANFILES.

12 files changed, 61 insertions, 4 deletions

diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog
index 29fbfdb336..459dc64ab0 100644
--- a/cpukit/itron/ChangeLog
+++ b/cpukit/itron/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Include compile.am, again.
diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am
index bc8828bc20..df69b06c16 100644
--- a/cpukit/itron/Makefile.am
+++ b/cpukit/itron/Makefile.am
@@ -6,6 +6,7 @@ include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
 EXTRA_DIST =
+CLEANFILES =
 
 if HAS_ITRON
 ## include
@@ -105,7 +106,7 @@ AM_CPPFLAGS += -I$(top_builddir)
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
 EXTRA_LIBRARIES = libitron.a
-CLEANFILES = libitron.a
+CLEANFILES += libitron.a
 libitron_a_SOURCES = $(C_FILES)
 libitron_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 
@@ -128,6 +129,7 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 if HAS_ITRON
 $(PROJECT_INCLUDE)/itron.h: include/itron.h $(PROJECT_INCLUDE)/$(dirstamp)
@@ -137,6 +139,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/itron.h
 $(PROJECT_INCLUDE)/itronsys/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/itronsys
 	@: > $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
 
 $(PROJECT_INCLUDE)/itronsys/eventflags.h: include/itronsys/eventflags.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/eventflags.h
@@ -197,6 +200,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/vmempool.h
 $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/itron
 	@: > $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/itron/config.h: include/rtems/itron/config.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/config.h
@@ -358,4 +362,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
 endif
 endif
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog
index d9356d78bc..8a958db835 100644
--- a/cpukit/libblock/ChangeLog
+++ b/cpukit/libblock/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Include compile.am, again.
diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am
index 0550fcd00c..e54c41ea8f 100644
--- a/cpukit/libblock/Makefile.am
+++ b/cpukit/libblock/Makefile.am
@@ -33,6 +33,7 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
@@ -54,4 +55,6 @@ $(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h $(PROJ
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog
index 6b3814de02..0b19286dc5 100644
--- a/cpukit/libcsupport/ChangeLog
+++ b/cpukit/libcsupport/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	PR 548/rtems
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index b1320fe93d..ec6938a6e7 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -119,8 +119,7 @@ libcsupport_a_SOURCES += src/unixlibc.c src/hosterr.c
 else
 libcsupport_a_SOURCES += $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \
     $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \
-    $(DIRECTORY_SCAN_C_FILES) $(ID_C_FILES) \
-    src/envlock.c
+    $(DIRECTORY_SCAN_C_FILES) $(ID_C_FILES) src/envlock.c
 endif
 
 libcsupport_g_a_SOURCES = $(libcsupport_a_SOURCES)
@@ -133,6 +132,7 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 $(PROJECT_INCLUDE)/chain.h: include/chain.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/chain.h
@@ -185,6 +185,7 @@ endif
 $(PROJECT_INCLUDE)/motorola/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/motorola
 	@: > $(PROJECT_INCLUDE)/motorola/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/$(dirstamp)
 
 $(PROJECT_INCLUDE)/motorola/mc68230.h: include/motorola/mc68230.h $(PROJECT_INCLUDE)/motorola/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/motorola/mc68230.h
@@ -197,6 +198,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola/mc68681.h
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/assoc.h: include/rtems/assoc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/assoc.h
@@ -229,6 +231,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cdefs.h
 $(PROJECT_INCLUDE)/sys/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/sys
 	@: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/$(dirstamp)
 
 $(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h
@@ -269,6 +272,7 @@ endif
 $(PROJECT_INCLUDE)/zilog/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/zilog
 	@: > $(PROJECT_INCLUDE)/zilog/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/$(dirstamp)
 
 $(PROJECT_INCLUDE)/zilog/z8036.h: include/zilog/z8036.h $(PROJECT_INCLUDE)/zilog/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8036.h
@@ -282,4 +286,6 @@ $(PROJECT_INCLUDE)/zilog/z8536.h: include/zilog/z8536.h $(PROJECT_INCLUDE)/zilog
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/zilog/z8536.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog/z8536.h
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 850d8104e3..7bee5cfa3a 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Include compile.am, again.
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index f5c363101e..5052d01ba0 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -90,6 +90,7 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 $(PROJECT_INCLUDE)/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/imfs.h
@@ -101,4 +102,6 @@ $(PROJECT_INCLUDE)/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/dosfs.h
 endif
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 62eb8e75a2..fe400d8eb0 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Include compile.am again. Misc fixes.
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index eb8b3c2069..775a319c17 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -251,10 +251,12 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/capture.h: capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
@@ -328,4 +330,6 @@ $(PROJECT_INCLUDE)/rtems/fsmount.h: fsmount/fsmount.h $(PROJECT_INCLUDE)/rtems/$
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index cfc324d047..451787a655 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Re-add dirstamps to PREINSTALL_FILES.
+	Add PREINSTALL_FILES to CLEANFILES.
+
 2004-01-11  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Include compile.am, again.
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 1d5c90892a..3c97a0f671 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -6,6 +6,7 @@ include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
 EXTRA_DIST =
+CLEANFILES =
 
 if HAS_POSIX
 
@@ -150,7 +151,7 @@ AM_CPPFLAGS += -I$(top_builddir)
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
 EXTRA_LIBRARIES = libposix.a
-CLEANFILES = libposix.a
+CLEANFILES += libposix.a
 libposix_a_SOURCES = $(C_FILES)
 libposix_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 
@@ -178,6 +179,7 @@ PREINSTALL_FILES =
 $(PROJECT_INCLUDE)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
 if HAS_POSIX
 $(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp)
@@ -199,6 +201,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/semaphore.h
 $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/posix
 	@: > $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rtems/posix/cancel.h: include/rtems/posix/cancel.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cancel.h
@@ -350,4 +353,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
 endif
 endif
 
+CLEANFILES += $(PREINSTALL_FILES)
+
 include $(top_srcdir)/automake/local.am