2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org>

	* libmisc/Makefile.am: Install serdbg.h, serdbgcnf.h,
	termios_printk.h, termios_printk_cnf.h to $(includedir)/rtems.
	* libmisc/serdbg/serdbg.c: Include <rtems/serdbg.h> instead of
	<serdbg.h>.
	* libmisc/serdbg/serdbgio.c: Include <rtems/serdbg.h> instead of
	<serdbg.h>.
	* libmisc/serdbg/termios_printk.c: Include <rtems/termios_printk.h>
	instead of <termios_printk.h>.

4 files changed, 16 insertions, 22 deletions

diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 692237aa67..1d1cd18209 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = README
 AM_CPPFLAGS += -I$(top_builddir)
 
 include_rtemsdir = $(includedir)/rtems
-include_HEADERS =
 include_rtems_HEADERS =
 EXTRA_LIBRARIES =
 TMP_LIBS =
@@ -171,7 +170,7 @@ TMP_LIBS += librtmonuse$(LIB_VARIANT).a
 ## serdbg
 
 if LIBSERDBG
-include_HEADERS += serdbg/serdbgcnf.h serdbg/serdbg.h \
+include_rtems_HEADERS += serdbg/serdbgcnf.h serdbg/serdbg.h \
     serdbg/termios_printk_cnf.h serdbg/termios_printk.h
 
 EXTRA_LIBRARIES += libserdbg.a
@@ -249,11 +248,6 @@ all-local: $(PREINSTALL_FILES) $(TMP_LIBS)
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
@@ -302,21 +296,21 @@ $(PROJECT_INCLUDE)/rtems/rtmonuse.h: rtmonuse/rtmonuse.h $(PROJECT_INCLUDE)/rtem
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtmonuse.h
 
 if LIBSERDBG
-$(PROJECT_INCLUDE)/serdbgcnf.h: serdbg/serdbgcnf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/serdbgcnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/serdbgcnf.h
+$(PROJECT_INCLUDE)/rtems/serdbgcnf.h: serdbg/serdbgcnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbgcnf.h
 
-$(PROJECT_INCLUDE)/serdbg.h: serdbg/serdbg.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/serdbg.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/serdbg.h
+$(PROJECT_INCLUDE)/rtems/serdbg.h: serdbg/serdbg.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/serdbg.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/serdbg.h
 
-$(PROJECT_INCLUDE)/termios_printk_cnf.h: serdbg/termios_printk_cnf.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/termios_printk_cnf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/termios_printk_cnf.h
+$(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h: serdbg/termios_printk_cnf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk_cnf.h
 
-$(PROJECT_INCLUDE)/termios_printk.h: serdbg/termios_printk.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/termios_printk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/termios_printk.h
+$(PROJECT_INCLUDE)/rtems/termios_printk.h: serdbg/termios_printk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/termios_printk.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/termios_printk.h
 endif
 
 $(PROJECT_INCLUDE)/rtems/stackchk.h: stackchk/stackchk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
diff --git a/cpukit/libmisc/serdbg/serdbg.c b/cpukit/libmisc/serdbg/serdbg.c
index 398ad27f26..ccc35d36d2 100644
--- a/cpukit/libmisc/serdbg/serdbg.c
+++ b/cpukit/libmisc/serdbg/serdbg.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <serdbg.h>
+#include <rtems/serdbg.h>
 
 
 /*=========================================================================*\
diff --git a/cpukit/libmisc/serdbg/serdbgio.c b/cpukit/libmisc/serdbg/serdbgio.c
index 6581bf88e5..c7eeecc379 100644
--- a/cpukit/libmisc/serdbg/serdbgio.c
+++ b/cpukit/libmisc/serdbg/serdbgio.c
@@ -38,7 +38,7 @@
 #include <termios.h>
 
 #include <rtems/termiostypes.h>
-#include <serdbg.h>
+#include <rtems/serdbg.h>
 
 
 /*
diff --git a/cpukit/libmisc/serdbg/termios_printk.c b/cpukit/libmisc/serdbg/termios_printk.c
index c924498c95..89fba880d9 100644
--- a/cpukit/libmisc/serdbg/termios_printk.c
+++ b/cpukit/libmisc/serdbg/termios_printk.c
@@ -37,7 +37,7 @@
 
 #include <rtems/termiostypes.h>
 #include <rtems/bspIo.h>
-#include <termios_printk.h>
+#include <rtems/termios_printk.h>
 
 /*
  * internal variables