2003-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Reformat. Apply dirstamps to preinstallation.
	* include/Makefile.am: Ditto.
	* include/rdbg/Makefile.am: Ditto.
	* include/rdbg/i386/Makefile.am: Ditto.
	* include/rdbg/m68k/Makefile.am: Ditto.
	* include/rdbg/powerpc/Makefile.am: Ditto:
	* src/Makefile.am: Ditto.
	* src/i386/Makefile.am: Ditto.
	* src/i386/any/Makefile.am: Ditto.
	* src/m68k/Makefile.am: Ditto.
	* src/m68k/any/Makefile.am: Ditto.
	* src/powerpc/Makefile.am: Ditto.
	* src/powerpc/new_exception_processing/Makefile.am: Ditto.

7 files changed, 47 insertions, 27 deletions

diff --git a/c/src/librdbg/src/Makefile.am b/c/src/librdbg/src/Makefile.am
index 861019e9f2..2a432ebaa0 100644
--- a/c/src/librdbg/src/Makefile.am
+++ b/c/src/librdbg/src/Makefile.am
@@ -10,5 +10,7 @@ endif
 EXTRA_DIST = _servtgt.c awk.svc excep.c ptrace.c rdbg.c remdeb.x servbkpt.c \
     servcon.c servrpc.c servtgt.c servtsp.c servutil.c
 
+PREINSTALL_FILES =
+
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am
index 311bc4744f..9f7706d4e1 100644
--- a/c/src/librdbg/src/i386/Makefile.am
+++ b/c/src/librdbg/src/i386/Makefile.am
@@ -2,10 +2,11 @@
 ## $Id$
 ##
 
-
 SUBDIRS = any
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
+PREINSTALL_FILES =
+
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/i386/any/Makefile.am b/c/src/librdbg/src/i386/any/Makefile.am
index 98b56a8125..2c75512f8c 100644
--- a/c/src/librdbg/src/i386/any/Makefile.am
+++ b/c/src/librdbg/src/i386/any/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
 RPCCPUDIR = $(RTEMS_CPU)/any
@@ -76,13 +75,8 @@ if RPCTOOLS
 	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rdbg:
-	@$(mkinstalldirs) $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
+include_rdbgdir = $(includedir)/rdbg
+include_rdbg_HEADERS = $(srcdir)/remdeb.h
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
@@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg
+	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/m68k/Makefile.am b/c/src/librdbg/src/m68k/Makefile.am
index 311bc4744f..9f7706d4e1 100644
--- a/c/src/librdbg/src/m68k/Makefile.am
+++ b/c/src/librdbg/src/m68k/Makefile.am
@@ -2,10 +2,11 @@
 ## $Id$
 ##
 
-
 SUBDIRS = any
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
+PREINSTALL_FILES =
+
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/m68k/any/Makefile.am b/c/src/librdbg/src/m68k/any/Makefile.am
index 98b56a8125..2c75512f8c 100644
--- a/c/src/librdbg/src/m68k/any/Makefile.am
+++ b/c/src/librdbg/src/m68k/any/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
 RPCCPUDIR = $(RTEMS_CPU)/any
@@ -76,13 +75,8 @@ if RPCTOOLS
 	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rdbg:
-	@$(mkinstalldirs) $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
+include_rdbgdir = $(includedir)/rdbg
+include_rdbg_HEADERS = $(srcdir)/remdeb.h
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
@@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg
+	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/powerpc/Makefile.am b/c/src/librdbg/src/powerpc/Makefile.am
index f50ce5c267..fbd72f3669 100644
--- a/c/src/librdbg/src/powerpc/Makefile.am
+++ b/c/src/librdbg/src/powerpc/Makefile.am
@@ -2,10 +2,11 @@
 ## $Id$
 ##
 
-
 SUBDIRS = new_exception_processing
 
 EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
+PREINSTALL_FILES =
+
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
index ea3b5d3d25..8c20fd159b 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/..:@srcdir@/../..
 
 RPCCPUDIR = $(RTEMS_CPU)/new_exception_processing
@@ -76,13 +75,8 @@ if RPCTOOLS
 	rm -f $(RPCCPUDIR)/tmpSvc.c )
 endif
 
-$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rdbg:
-	@$(mkinstalldirs) $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rdbg $(PROJECT_INCLUDE)/rdbg/remdeb.h
+include_rdbgdir = $(includedir)/rdbg
+include_rdbg_HEADERS = $(srcdir)/remdeb.h
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
@@ -90,4 +84,15 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = remdeb_f.x $(GEN_C_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rdbg/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rdbg
+	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
+
 include $(top_srcdir)/automake/local.am