2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Add $(dirstamp) to preinstallation rules.
	Remove MACROS.

8 files changed, 409 insertions, 386 deletions

diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog
index 68ea72da2c..0d057fbc04 100644
--- a/cpukit/itron/ChangeLog
+++ b/cpukit/itron/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+	Remove MACROS.
+
 2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reworked.
diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am
index 65361f0ece..7609c5dda1 100644
--- a/cpukit/itron/Makefile.am
+++ b/cpukit/itron/Makefile.am
@@ -52,11 +52,7 @@ include_rtems_itron_HEADERS += inline/rtems/itron/eventflags.inl \
     inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl \
     inline/rtems/itron/task.inl inline/rtems/itron/time.inl \
     inline/rtems/itron/vmempool.inl
-endif
-
-## Macros
-
-if MACROS
+else
 include_rtems_itron_HEADERS += macros/rtems/itron/eventflags.inl \
     macros/rtems/itron/fmempool.inl macros/rtems/itron/intr.inl \
     macros/rtems/itron/mbox.inl macros/rtems/itron/msgbuffer.inl \
@@ -129,232 +125,238 @@ EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) src/TODO
 
 PREINSTALL_FILES =
 
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
 if HAS_ITRON
-$(PROJECT_INCLUDE)/itron.h: include/itron.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itron.h: include/itron.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itron.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itron.h
 
-$(PROJECT_INCLUDE)/itronsys:
+$(PROJECT_INCLUDE)/itronsys/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/itronsys
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys
+	@: > $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
 
-$(PROJECT_INCLUDE)/itronsys/eventflags.h: include/itronsys/eventflags.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/eventflags.h: include/itronsys/eventflags.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/eventflags.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/eventflags.h
 
-$(PROJECT_INCLUDE)/itronsys/fmempool.h: include/itronsys/fmempool.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/fmempool.h: include/itronsys/fmempool.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/fmempool.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/fmempool.h
 
-$(PROJECT_INCLUDE)/itronsys/intr.h: include/itronsys/intr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/intr.h: include/itronsys/intr.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/intr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/intr.h
 
-$(PROJECT_INCLUDE)/itronsys/mbox.h: include/itronsys/mbox.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/mbox.h: include/itronsys/mbox.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/mbox.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/mbox.h
 
-$(PROJECT_INCLUDE)/itronsys/msgbuffer.h: include/itronsys/msgbuffer.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/msgbuffer.h: include/itronsys/msgbuffer.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/msgbuffer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/msgbuffer.h
 
-$(PROJECT_INCLUDE)/itronsys/network.h: include/itronsys/network.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/network.h: include/itronsys/network.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/network.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/network.h
 
-$(PROJECT_INCLUDE)/itronsys/port.h: include/itronsys/port.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/port.h: include/itronsys/port.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/port.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/port.h
 
-$(PROJECT_INCLUDE)/itronsys/semaphore.h: include/itronsys/semaphore.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/semaphore.h: include/itronsys/semaphore.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/semaphore.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/semaphore.h
 
-$(PROJECT_INCLUDE)/itronsys/status.h: include/itronsys/status.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/status.h: include/itronsys/status.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/status.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/status.h
 
-$(PROJECT_INCLUDE)/itronsys/sysmgmt.h: include/itronsys/sysmgmt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/sysmgmt.h: include/itronsys/sysmgmt.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/sysmgmt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/sysmgmt.h
 
-$(PROJECT_INCLUDE)/itronsys/task.h: include/itronsys/task.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/task.h: include/itronsys/task.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/task.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/task.h
 
-$(PROJECT_INCLUDE)/itronsys/time.h: include/itronsys/time.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/time.h: include/itronsys/time.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/time.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/time.h
 
-$(PROJECT_INCLUDE)/itronsys/types.h: include/itronsys/types.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/types.h: include/itronsys/types.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/types.h
 
-$(PROJECT_INCLUDE)/itronsys/vmempool.h: include/itronsys/vmempool.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/itronsys/vmempool.h: include/itronsys/vmempool.h $(PROJECT_INCLUDE)/itronsys/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/itronsys/vmempool.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys/vmempool.h
 
-$(PROJECT_INCLUDE)/rtems/itron:
+$(PROJECT_INCLUDE)/rtems/itron/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/itron
-PREINSTALL_FILES += $(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
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/config.h: include/rtems/itron/config.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/config.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/config.h
 
-$(PROJECT_INCLUDE)/rtems/itron/eventflags.h: include/rtems/itron/eventflags.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/eventflags.h: include/rtems/itron/eventflags.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.h
 
-$(PROJECT_INCLUDE)/rtems/itron/fmempool.h: include/rtems/itron/fmempool.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/fmempool.h: include/rtems/itron/fmempool.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/fmempool.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/fmempool.h
 
-$(PROJECT_INCLUDE)/rtems/itron/intr.h: include/rtems/itron/intr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/intr.h: include/rtems/itron/intr.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/intr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/intr.h
 
-$(PROJECT_INCLUDE)/rtems/itron/itronapi.h: include/rtems/itron/itronapi.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/itronapi.h: include/rtems/itron/itronapi.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/itronapi.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/itronapi.h
 
-$(PROJECT_INCLUDE)/rtems/itron/mbox.h: include/rtems/itron/mbox.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/mbox.h: include/rtems/itron/mbox.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/mbox.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/mbox.h
 
-$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.h: include/rtems/itron/msgbuffer.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.h: include/rtems/itron/msgbuffer.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.h
 
-$(PROJECT_INCLUDE)/rtems/itron/network.h: include/rtems/itron/network.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/network.h: include/rtems/itron/network.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/network.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/network.h
 
-$(PROJECT_INCLUDE)/rtems/itron/object.h: include/rtems/itron/object.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/object.h: include/rtems/itron/object.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/object.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/object.h
 
-$(PROJECT_INCLUDE)/rtems/itron/port.h: include/rtems/itron/port.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/port.h: include/rtems/itron/port.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/port.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/port.h
 
-$(PROJECT_INCLUDE)/rtems/itron/semaphore.h: include/rtems/itron/semaphore.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/semaphore.h: include/rtems/itron/semaphore.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/semaphore.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/semaphore.h
 
-$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.h: include/rtems/itron/sysmgmt.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.h: include/rtems/itron/sysmgmt.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.h
 
-$(PROJECT_INCLUDE)/rtems/itron/task.h: include/rtems/itron/task.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/task.h: include/rtems/itron/task.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/task.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/task.h
 
-$(PROJECT_INCLUDE)/rtems/itron/time.h: include/rtems/itron/time.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/time.h: include/rtems/itron/time.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/time.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.h
 
-$(PROJECT_INCLUDE)/rtems/itron/vmempool.h: include/rtems/itron/vmempool.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/vmempool.h: include/rtems/itron/vmempool.h $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.h
 
 if INLINE
-$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: inline/rtems/itron/eventflags.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: inline/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: inline/rtems/itron/fmempool.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: inline/rtems/itron/fmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/intr.inl: inline/rtems/itron/intr.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/intr.inl: inline/rtems/itron/intr.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/intr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/intr.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/mbox.inl: inline/rtems/itron/mbox.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/mbox.inl: inline/rtems/itron/mbox.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: inline/rtems/itron/msgbuffer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: inline/rtems/itron/msgbuffer.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/network.inl: inline/rtems/itron/network.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/network.inl: inline/rtems/itron/network.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/network.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/network.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/port.inl: inline/rtems/itron/port.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/port.inl: inline/rtems/itron/port.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/port.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/port.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: inline/rtems/itron/semaphore.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: inline/rtems/itron/semaphore.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: inline/rtems/itron/sysmgmt.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: inline/rtems/itron/sysmgmt.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/task.inl: inline/rtems/itron/task.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/task.inl: inline/rtems/itron/task.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/task.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/task.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/time.inl: inline/rtems/itron/time.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/time.inl: inline/rtems/itron/time.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/time.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: inline/rtems/itron/vmempool.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: inline/rtems/itron/vmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
-endif
 
-if MACROS
-$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: macros/rtems/itron/eventflags.inl
-	$(INSTALL_DATA) $< $@
+else
+$(PROJECT_INCLUDE)/rtems/itron/eventflags.inl: macros/rtems/itron/eventflags.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/eventflags.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: macros/rtems/itron/fmempool.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/fmempool.inl: macros/rtems/itron/fmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/fmempool.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/intr.inl: macros/rtems/itron/intr.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/intr.inl: macros/rtems/itron/intr.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/intr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/intr.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/mbox.inl: macros/rtems/itron/mbox.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/mbox.inl: macros/rtems/itron/mbox.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/mbox.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: macros/rtems/itron/msgbuffer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl: macros/rtems/itron/msgbuffer.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/msgbuffer.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/network.inl: macros/rtems/itron/network.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/network.inl: macros/rtems/itron/network.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/network.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/network.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/port.inl: macros/rtems/itron/port.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/port.inl: macros/rtems/itron/port.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/port.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/port.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: macros/rtems/itron/semaphore.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/semaphore.inl: macros/rtems/itron/semaphore.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/semaphore.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: macros/rtems/itron/sysmgmt.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl: macros/rtems/itron/sysmgmt.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/sysmgmt.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/task.inl: macros/rtems/itron/task.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/task.inl: macros/rtems/itron/task.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/task.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/task.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/time.inl: macros/rtems/itron/time.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/time.inl: macros/rtems/itron/time.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/time.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/time.inl
 
-$(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: macros/rtems/itron/vmempool.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/itron/vmempool.inl: macros/rtems/itron/vmempool.inl $(PROJECT_INCLUDE)/rtems/itron/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron/vmempool.inl
 endif
 endif
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 078cf8b3d8..11736a7dd9 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+	Remove MACROS.
+
 2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reworked.
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 88df6d3302..73a1050f54 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -39,8 +39,6 @@ endif
 noinst_HEADERS += include/rtems/posix/intr.h \
     include/rtems/posix/threadsup.h
 
-## inline
-
 if INLINE
 include_rtems_posix_HEADERS += inline/rtems/posix/cond.inl \
     inline/rtems/posix/key.inl inline/rtems/posix/mqueue.inl \
@@ -48,11 +46,7 @@ include_rtems_posix_HEADERS += inline/rtems/posix/cond.inl \
     inline/rtems/posix/priority.inl inline/rtems/posix/semaphore.inl \
     inline/rtems/posix/timer.inl
 noinst_HEADERS += inline/rtems/posix/intr.inl
-endif
-
-## macros
-
-if MACROS
+else
 include_rtems_posix_HEADERS += macros/rtems/posix/cond.inl \
     macros/rtems/posix/key.inl macros/rtems/posix/mqueue.inl \
     macros/rtems/posix/mutex.inl macros/rtems/posix/pthread.inl \
@@ -184,174 +178,179 @@ EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES)
 
 PREINSTALL_FILES =
 
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
 if HAS_POSIX
-$(PROJECT_INCLUDE)/sched.h: include/sched.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sched.h
 
-$(PROJECT_INCLUDE)/aio.h: include/aio.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/aio.h: include/aio.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/aio.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/aio.h
 
-$(PROJECT_INCLUDE)/mqueue.h: include/mqueue.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/mqueue.h: include/mqueue.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mqueue.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mqueue.h
 
-$(PROJECT_INCLUDE)/semaphore.h: include/semaphore.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/semaphore.h: include/semaphore.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/semaphore.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/semaphore.h
 
-$(PROJECT_INCLUDE)/rtems/posix:
+$(PROJECT_INCLUDE)/rtems/posix/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/posix
-PREINSTALL_FILES += $(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
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/cancel.h: include/rtems/posix/cancel.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cancel.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/cancel.h
 
-$(PROJECT_INCLUDE)/rtems/posix/cond.h: include/rtems/posix/cond.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/cond.h: include/rtems/posix/cond.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cond.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/cond.h
 
-$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/config.h: include/rtems/posix/config.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/config.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/config.h
 
-$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/key.h: include/rtems/posix/key.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.h
 
-$(PROJECT_INCLUDE)/rtems/posix/mqueue.h: include/rtems/posix/mqueue.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mqueue.h: include/rtems/posix/mqueue.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.h
 
-$(PROJECT_INCLUDE)/rtems/posix/mutex.h: include/rtems/posix/mutex.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mutex.h: include/rtems/posix/mutex.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mutex.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mutex.h
 
-$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/posixapi.h: include/rtems/posix/posixapi.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/posixapi.h
 
-$(PROJECT_INCLUDE)/rtems/posix/priority.h: include/rtems/posix/priority.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/priority.h: include/rtems/posix/priority.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.h
 
-$(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/psignal.h: include/rtems/posix/psignal.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/psignal.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/psignal.h
 
-$(PROJECT_INCLUDE)/rtems/posix/pthread.h: include/rtems/posix/pthread.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/pthread.h: include/rtems/posix/pthread.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.h
 
-$(PROJECT_INCLUDE)/rtems/posix/ptimer.h: include/rtems/posix/ptimer.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/ptimer.h: include/rtems/posix/ptimer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
 
-$(PROJECT_INCLUDE)/rtems/posix/semaphore.h: include/rtems/posix/semaphore.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/semaphore.h: include/rtems/posix/semaphore.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.h
 
-$(PROJECT_INCLUDE)/rtems/posix/threadsup.h: include/rtems/posix/threadsup.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/threadsup.h: include/rtems/posix/threadsup.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
 
-$(PROJECT_INCLUDE)/rtems/posix/time.h: include/rtems/posix/time.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/time.h: include/rtems/posix/time.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/time.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/time.h
 
-$(PROJECT_INCLUDE)/rtems/posix/timer.h: include/rtems/posix/timer.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/timer.h: include/rtems/posix/timer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.h
 
 if HAS_MP
-$(PROJECT_INCLUDE)/rtems/posix/condmp.h: include/rtems/posix/condmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/condmp.h: include/rtems/posix/condmp.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/condmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/condmp.h
 
-$(PROJECT_INCLUDE)/rtems/posix/mqueuemp.h: include/rtems/posix/mqueuemp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mqueuemp.h: include/rtems/posix/mqueuemp.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueuemp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueuemp.h
 
-$(PROJECT_INCLUDE)/rtems/posix/mutexmp.h: include/rtems/posix/mutexmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mutexmp.h: include/rtems/posix/mutexmp.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mutexmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mutexmp.h
 
-$(PROJECT_INCLUDE)/rtems/posix/pthreadmp.h: include/rtems/posix/pthreadmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/pthreadmp.h: include/rtems/posix/pthreadmp.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadmp.h
 
-$(PROJECT_INCLUDE)/rtems/posix/semaphoremp.h: include/rtems/posix/semaphoremp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/semaphoremp.h: include/rtems/posix/semaphoremp.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphoremp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphoremp.h
 endif
 
 if INLINE
-$(PROJECT_INCLUDE)/rtems/posix/cond.inl: inline/rtems/posix/cond.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/cond.inl: inline/rtems/posix/cond.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cond.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/cond.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/key.inl: inline/rtems/posix/key.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/key.inl: inline/rtems/posix/key.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/mqueue.inl: inline/rtems/posix/mqueue.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mqueue.inl: inline/rtems/posix/mqueue.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/mutex.inl: inline/rtems/posix/mutex.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mutex.inl: inline/rtems/posix/mutex.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/pthread.inl: inline/rtems/posix/pthread.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/pthread.inl: inline/rtems/posix/pthread.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/priority.inl: inline/rtems/posix/priority.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/priority.inl: inline/rtems/posix/priority.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/semaphore.inl: inline/rtems/posix/semaphore.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/semaphore.inl: inline/rtems/posix/semaphore.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/timer.inl: inline/rtems/posix/timer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/timer.inl: inline/rtems/posix/timer.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
-endif
 
-if MACROS
-$(PROJECT_INCLUDE)/rtems/posix/cond.inl: macros/rtems/posix/cond.inl
-	$(INSTALL_DATA) $< $@
+else
+$(PROJECT_INCLUDE)/rtems/posix/cond.inl: macros/rtems/posix/cond.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/cond.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/cond.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/key.inl: macros/rtems/posix/key.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/key.inl: macros/rtems/posix/key.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/mqueue.inl: macros/rtems/posix/mqueue.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mqueue.inl: macros/rtems/posix/mqueue.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mqueue.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/mutex.inl: macros/rtems/posix/mutex.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/mutex.inl: macros/rtems/posix/mutex.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/mutex.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/pthread.inl: macros/rtems/posix/pthread.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/pthread.inl: macros/rtems/posix/pthread.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/priority.inl: macros/rtems/posix/priority.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/priority.inl: macros/rtems/posix/priority.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/priority.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/priority.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/semaphore.inl: macros/rtems/posix/semaphore.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/semaphore.inl: macros/rtems/posix/semaphore.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/semaphore.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/timer.inl: macros/rtems/posix/timer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/posix/timer.inl: macros/rtems/posix/timer.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
 endif
 endif
diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog
index 72c6f6dc70..079ec94c1c 100644
--- a/cpukit/rtems/ChangeLog
+++ b/cpukit/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+	Remove MACROS.
+
 2003-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reworked.
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 5c30480958..5f2135fddb 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -35,20 +35,6 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/eventmp.h \
     include/rtems/rtems/taskmp.h
 endif
 
-## macros
-if MACROS
-include_rtems_rtems_HEADERS += macros/rtems/rtems/asr.inl \
-    macros/rtems/rtems/attr.inl macros/rtems/rtems/dpmem.inl \
-    macros/rtems/rtems/event.inl macros/rtems/rtems/eventset.inl \
-    macros/rtems/rtems/message.inl macros/rtems/rtems/modes.inl \
-    macros/rtems/rtems/options.inl macros/rtems/rtems/part.inl \
-    macros/rtems/rtems/ratemon.inl macros/rtems/rtems/region.inl \
-    macros/rtems/rtems/sem.inl macros/rtems/rtems/status.inl \
-    macros/rtems/rtems/support.inl macros/rtems/rtems/tasks.inl \
-    macros/rtems/rtems/timer.inl
-endif
-
-## inline
 if INLINE
 include_rtems_rtems_HEADERS += inline/rtems/rtems/asr.inl \
     inline/rtems/rtems/attr.inl inline/rtems/rtems/dpmem.inl \
@@ -59,6 +45,16 @@ include_rtems_rtems_HEADERS += inline/rtems/rtems/asr.inl \
     inline/rtems/rtems/sem.inl inline/rtems/rtems/status.inl \
     inline/rtems/rtems/support.inl inline/rtems/rtems/tasks.inl \
     inline/rtems/rtems/timer.inl
+else
+include_rtems_rtems_HEADERS += macros/rtems/rtems/asr.inl \
+    macros/rtems/rtems/attr.inl macros/rtems/rtems/dpmem.inl \
+    macros/rtems/rtems/event.inl macros/rtems/rtems/eventset.inl \
+    macros/rtems/rtems/message.inl macros/rtems/rtems/modes.inl \
+    macros/rtems/rtems/options.inl macros/rtems/rtems/part.inl \
+    macros/rtems/rtems/ratemon.inl macros/rtems/rtems/region.inl \
+    macros/rtems/rtems/sem.inl macros/rtems/rtems/status.inl \
+    macros/rtems/rtems/support.inl macros/rtems/rtems/tasks.inl \
+    macros/rtems/rtems/timer.inl
 endif
 
 ## src
@@ -146,269 +142,274 @@ EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/rtems.h: include/rtems.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems.h: include/rtems.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems.h
 
-$(PROJECT_INCLUDE)/rtems/rtems:
+$(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/rtems
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rtems/rtems/asr.h: include/rtems/rtems/asr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/asr.h: include/rtems/rtems/asr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/attr.h: include/rtems/rtems/attr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/cache.h: include/rtems/rtems/cache.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/cache.h: include/rtems/rtems/cache.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/cache.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/cache.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/clock.h: include/rtems/rtems/clock.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/clock.h: include/rtems/rtems/clock.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/clock.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/clock.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/config.h: include/rtems/rtems/config.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/config.h: include/rtems/rtems/config.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/config.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/config.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/dpmem.h: include/rtems/rtems/dpmem.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/dpmem.h: include/rtems/rtems/dpmem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/event.h: include/rtems/rtems/event.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/event.h: include/rtems/rtems/event.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/eventset.h: include/rtems/rtems/eventset.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/eventset.h: include/rtems/rtems/eventset.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventset.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventset.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/intr.h: include/rtems/rtems/intr.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/intr.h: include/rtems/rtems/intr.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/intr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/intr.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/message.h: include/rtems/rtems/message.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/message.h: include/rtems/rtems/message.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/modes.h: include/rtems/rtems/modes.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/modes.h: include/rtems/rtems/modes.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/options.h: include/rtems/rtems/options.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/options.h: include/rtems/rtems/options.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/part.h: include/rtems/rtems/part.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/part.h: include/rtems/rtems/part.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/ratemon.h: include/rtems/rtems/ratemon.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/ratemon.h: include/rtems/rtems/ratemon.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/region.h: include/rtems/rtems/region.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/region.h: include/rtems/rtems/region.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h: include/rtems/rtems/rtemsapi.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h: include/rtems/rtems/rtemsapi.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/rtemsapi.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/sem.h: include/rtems/rtems/sem.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/sem.h: include/rtems/rtems/sem.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/signal.h: include/rtems/rtems/signal.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/signal.h: include/rtems/rtems/signal.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signal.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signal.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/status.h: include/rtems/rtems/status.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/status.h: include/rtems/rtems/status.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/support.h: include/rtems/rtems/support.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/support.h: include/rtems/rtems/support.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/tasks.h: include/rtems/rtems/tasks.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/tasks.h: include/rtems/rtems/tasks.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/timer.h: include/rtems/rtems/timer.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/timer.h: include/rtems/rtems/timer.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/types.h: include/rtems/rtems/types.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/types.h
 
 if HAS_MP
-$(PROJECT_INCLUDE)/rtems/rtems/eventmp.h: include/rtems/rtems/eventmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/eventmp.h: include/rtems/rtems/eventmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/mp.h: include/rtems/rtems/mp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/mp.h: include/rtems/rtems/mp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/mp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/mp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/msgmp.h: include/rtems/rtems/msgmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/msgmp.h: include/rtems/rtems/msgmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/msgmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/partmp.h: include/rtems/rtems/partmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/partmp.h: include/rtems/rtems/partmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/partmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/regionmp.h: include/rtems/rtems/regionmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/regionmp.h: include/rtems/rtems/regionmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/regionmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/regionmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/semmp.h: include/rtems/rtems/semmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/semmp.h: include/rtems/rtems/semmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/semmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/signalmp.h: include/rtems/rtems/signalmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/signalmp.h: include/rtems/rtems/signalmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/signalmp.h
 
-$(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/taskmp.h: include/rtems/rtems/taskmp.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/taskmp.h
 endif
 
-if MACROS
-$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: macros/rtems/rtems/asr.inl
-	$(INSTALL_DATA) $< $@
+if INLINE
+$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: inline/rtems/rtems/asr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/attr.inl: macros/rtems/rtems/attr.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/attr.inl: inline/rtems/rtems/attr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: macros/rtems/rtems/dpmem.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: inline/rtems/rtems/dpmem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/event.inl: macros/rtems/rtems/event.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/event.inl: inline/rtems/rtems/event.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/eventset.inl: macros/rtems/rtems/eventset.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/eventset.inl: inline/rtems/rtems/eventset.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/message.inl: macros/rtems/rtems/message.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/message.inl: inline/rtems/rtems/message.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/modes.inl: macros/rtems/rtems/modes.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/modes.inl: inline/rtems/rtems/modes.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/options.inl: macros/rtems/rtems/options.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/options.inl: inline/rtems/rtems/options.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/part.inl: macros/rtems/rtems/part.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/part.inl: inline/rtems/rtems/part.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl: macros/rtems/rtems/ratemon.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl: inline/rtems/rtems/ratemon.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/region.inl: macros/rtems/rtems/region.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/region.inl: inline/rtems/rtems/region.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/sem.inl: macros/rtems/rtems/sem.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/sem.inl: inline/rtems/rtems/sem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/status.inl: macros/rtems/rtems/status.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/status.inl: inline/rtems/rtems/status.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/support.inl: macros/rtems/rtems/support.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/support.inl: inline/rtems/rtems/support.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: macros/rtems/rtems/tasks.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: inline/rtems/rtems/tasks.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/timer.inl: macros/rtems/rtems/timer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/timer.inl: inline/rtems/rtems/timer.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
-endif
 
-if INLINE
-$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: inline/rtems/rtems/asr.inl
-	$(INSTALL_DATA) $< $@
+else
+$(PROJECT_INCLUDE)/rtems/rtems/asr.inl: macros/rtems/rtems/asr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/asr.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/attr.inl: inline/rtems/rtems/attr.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/attr.inl: macros/rtems/rtems/attr.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/attr.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: inline/rtems/rtems/dpmem.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl: macros/rtems/rtems/dpmem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/dpmem.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/event.inl: inline/rtems/rtems/event.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/event.inl: macros/rtems/rtems/event.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/event.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/event.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/eventset.inl: inline/rtems/rtems/eventset.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/eventset.inl: macros/rtems/rtems/eventset.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/eventset.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/message.inl: inline/rtems/rtems/message.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/message.inl: macros/rtems/rtems/message.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/message.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/message.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/modes.inl: inline/rtems/rtems/modes.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/modes.inl: macros/rtems/rtems/modes.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/options.inl: inline/rtems/rtems/options.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/options.inl: macros/rtems/rtems/options.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/part.inl: inline/rtems/rtems/part.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/part.inl: macros/rtems/rtems/part.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl: inline/rtems/rtems/ratemon.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl: macros/rtems/rtems/ratemon.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/ratemon.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/region.inl: inline/rtems/rtems/region.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/region.inl: macros/rtems/rtems/region.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/region.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/region.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/sem.inl: inline/rtems/rtems/sem.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/sem.inl: macros/rtems/rtems/sem.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/sem.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/status.inl: inline/rtems/rtems/status.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/status.inl: macros/rtems/rtems/status.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/status.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/status.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/support.inl: inline/rtems/rtems/support.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/support.inl: macros/rtems/rtems/support.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/support.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/support.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: inline/rtems/rtems/tasks.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/tasks.inl: macros/rtems/rtems/tasks.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/tasks.inl
 
-$(PROJECT_INCLUDE)/rtems/rtems/timer.inl: inline/rtems/rtems/timer.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/rtems/timer.inl: macros/rtems/rtems/timer.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.inl
 endif
 
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index ff2f1abd65..b0b3d3f717 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add $(dirstamp) to preinstallation rules.
+	Remove MACROS.
+
 2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reworked.
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 8ad30339d9..b236657a47 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -16,13 +16,9 @@ include_rtems_HEADERS = include/rtems/config.h include/rtems/extension.h \
 
 EXTRA_DIST = include/rtems/README
 
-## inline
 if INLINE
 include_rtems_HEADERS += inline/rtems/extension.inl
-endif
-
-## macros
-if MACROS
+else
 include_rtems_HEADERS += macros/rtems/extension.inl
 endif
 
@@ -54,51 +50,56 @@ EXTRA_DIST += $(C_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/confdefs.h: include/confdefs.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/confdefs.h: include/confdefs.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/confdefs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/confdefs.h
 
-$(PROJECT_INCLUDE)/rtems:
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems
+	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 
-$(PROJECT_INCLUDE)/rtems/config.h: include/rtems/config.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/config.h: include/rtems/config.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/config.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/config.h
 
-$(PROJECT_INCLUDE)/rtems/extension.h: include/rtems/extension.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/extension.h: include/rtems/extension.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.h
 
-$(PROJECT_INCLUDE)/rtems/fatal.h: include/rtems/fatal.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/fatal.h: include/rtems/fatal.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fatal.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fatal.h
 
-$(PROJECT_INCLUDE)/rtems/init.h: include/rtems/init.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/init.h: include/rtems/init.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/init.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/init.h
 
-$(PROJECT_INCLUDE)/rtems/io.h: include/rtems/io.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/io.h: include/rtems/io.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/io.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/io.h
 
-$(PROJECT_INCLUDE)/rtems/mptables.h: include/rtems/mptables.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/mptables.h: include/rtems/mptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mptables.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mptables.h
 
-$(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sptables.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h
 
 if INLINE
-$(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
-endif
 
-if MACROS
-$(PROJECT_INCLUDE)/rtems/extension.inl: macros/rtems/extension.inl
-	$(INSTALL_DATA) $< $@
+else
+$(PROJECT_INCLUDE)/rtems/extension.inl: macros/rtems/extension.inl $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
 endif