2005-02-08 Ralf Corsepius <ralf.corsepius@rtems.org>

	* configure.ac: Add new header guard to cpuopts.h.
	* Makefile.am: Add libfs, libblock, ftpd header install rules.
	* libfs/Makefile.am, libblock/Makefile.am, ftpd/Makefile.am: Remove
	header install rules.

6 files changed, 74 insertions, 97 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 5633d23d12..2d186630f2 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
 2005-02-08	Ralf Corsepius <ralf.corsepius@rtems.org>
 
+	* configure.ac: Add new header guard to cpuopts.h.
+	* Makefile.am: Add libfs, libblock, ftpd header install rules.
+	* libfs/Makefile.am, libblock/Makefile.am, ftpd/Makefile.am: Remove
+	header install rules.
+
+2005-02-08	Ralf Corsepius <ralf.corsepius@rtems.org>
+
 	* aclocal/rtems-top.m4 (rtems_updir): Quote sed args.
 
 2005-02-08	Ralf Corsepius <ralf.corsepius@rtems.org>
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index e5c8afa90e..6f7b2e15b2 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -71,6 +71,26 @@ include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \
     include/rtems/fs.h include/rtems/pci.h include/rtems/stdint.h \
     include/rtems/concat.h include/rtems/tar.h
 
+## libfs
+include_rtems_HEADERS += libfs/src/imfs/imfs.h
+
+if !UNIX
+include_rtems_HEADERS += libfs/src/dosfs/dosfs.h
+endif
+
+## libblock
+if !UNIX
+include_rtems_HEADERS += libblock/include/rtems/bdbuf.h \
+    libblock/include/rtems/blkdev.h libblock/include/rtems/diskdevs.h \
+    libblock/include/rtems/ramdisk.h \
+    libblock/include/rtems/ide_part_table.h
+endif
+
+## ftpd
+if HAS_NETWORKING
+include_rtems_HEADERS += ftpd/ftpd.h
+endif
+
 ## capture
 include_rtems_HEADERS += libmisc/capture/capture.h \
     libmisc/capture/capture-cli.h
@@ -304,6 +324,44 @@ $(PROJECT_INCLUDE)/rtems/tar.h: include/rtems/tar.h $(PROJECT_INCLUDE)/rtems/$(d
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tar.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tar.h
 
+$(PROJECT_INCLUDE)/rtems/imfs.h: libfs/src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
+
+if !UNIX
+$(PROJECT_INCLUDE)/rtems/dosfs.h: libfs/src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
+endif
+
+if !UNIX
+$(PROJECT_INCLUDE)/rtems/bdbuf.h: libblock/include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
+
+$(PROJECT_INCLUDE)/rtems/blkdev.h: libblock/include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
+
+$(PROJECT_INCLUDE)/rtems/diskdevs.h: libblock/include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
+
+$(PROJECT_INCLUDE)/rtems/ramdisk.h: libblock/include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
+
+$(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
+endif
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
+endif
+
 $(PROJECT_INCLUDE)/rtems/capture.h: libmisc/capture/capture.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/capture.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/capture.h
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 39c969eeec..acd06e5863 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -132,8 +132,8 @@ cat >>cpuopts.tmp <<\_ACEOF
  */
 /* target cpu dependent options file */
 /* automatically generated -- DO NOT EDIT!! */
-#ifndef __CPU_OPTIONS_h
-#define __CPU_OPTIONS_h
+#ifndef _CPU_OPTIONS_H
+#define _CPU_OPTIONS_H
 _ACEOF
 
 RTEMS_CPUOPT([RTEMS_DEBUG],
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 5e88bd8296..c76448b7e2 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -5,18 +5,12 @@
 include $(top_srcdir)/automake/compile.am
 
 if HAS_NETWORKING
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = ftpd.h
-
 project_lib_LIBRARIES = libftpd.a
 libftpd_a_SOURCES = ftpd.c ftpd.h
-libftpd_a_CPPFLAGS = $(AM_CPPFLAGS)
 endif
 
 all-local: $(PREINSTALL_FILES)
 
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
 TMPINSTALL_FILES =
 
 $(PROJECT_LIB)/$(dirstamp):
@@ -25,22 +19,11 @@ $(PROJECT_LIB)/$(dirstamp):
 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
-
 $(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
 TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a
 endif
 
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-CLEANFILES += $(TMPINSTALL_FILES)
+CLEANFILES = $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am
index cab60ca68a..ca9216a0e8 100644
--- a/cpukit/libblock/Makefile.am
+++ b/cpukit/libblock/Makefile.am
@@ -5,55 +5,14 @@
 include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 
-CLEANFILES =
-
 if !UNIX
-include_rtemsdir = $(includedir)/rtems
-
 noinst_LIBRARIES = libblock.a
-libblock_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \
+libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
+    src/ide_part_table.c include/rtems/bdbuf.h include/rtems/blkdev.h \
     include/rtems/diskdevs.h include/rtems/ramdisk.h \
     include/rtems/ide_part_table.h
 
-libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \
-    src/ide_part_table.c
-
 all-local: $(PREINSTALL_FILES)
 endif
 
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-if !UNIX
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/bdbuf.h: include/rtems/bdbuf.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdbuf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdbuf.h
-
-$(PROJECT_INCLUDE)/rtems/blkdev.h: include/rtems/blkdev.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/blkdev.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/blkdev.h
-
-$(PROJECT_INCLUDE)/rtems/diskdevs.h: include/rtems/diskdevs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/diskdevs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/diskdevs.h
-
-$(PROJECT_INCLUDE)/rtems/ramdisk.h: include/rtems/ramdisk.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ramdisk.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ramdisk.h
-
-$(PROJECT_INCLUDE)/rtems/ide_part_table.h: include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
-endif
-
-CLEANFILES += $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index c0892f7418..abd6b6d85f 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -7,11 +7,7 @@ include $(top_srcdir)/automake/compile.am
 
 EXTRA_DIST = README
 
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS =
-
 noinst_LIBRARIES = libimfs.a
-libimfs_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 libimfs_a_SOURCES =
 
@@ -30,16 +26,14 @@ libimfs_a_SOURCES += src/imfs/imfs_chown.c src/imfs/imfs_config.c \
     src/imfs/imfs_handlers_link.c src/imfs/imfs_handlers_memfile.c \
     src/imfs/imfs_debug.c src/imfs/imfs_rmnod.c src/imfs/imfs_symlink.c \
     src/imfs/imfs_readlink.c src/imfs/imfs_fdatasync.c src/imfs/imfs_fcntl.c \
-    src/imfs/ioman.c src/imfs/miniimfs_init.c src/imfs/imfs_load_tar.c
+    src/imfs/ioman.c src/imfs/miniimfs_init.c src/imfs/imfs_load_tar.c \
+    src/imfs/imfs.h
 endif
 
-include_rtems_HEADERS += src/imfs/imfs.h
-
 # dosfs
 
 if !UNIX
 noinst_LIBRARIES += libdosfs.a
-libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # libdosfs_FATFS_C_FILES
 libdosfs_a_SOURCES = src/dosfs/fat.c src/dosfs/fat.h \
@@ -53,36 +47,12 @@ libdosfs_a_SOURCES += src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \
     src/dosfs/msdos_handlers_file.c src/dosfs/msdos_init.c \
     src/dosfs/msdos_initsupp.c src/dosfs/msdos_misc.c \
     src/dosfs/msdos_mknod.c src/dosfs/msdos_node_type.c \
-    src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c
-
-include_rtems_HEADERS += src/dosfs/dosfs.h
+    src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c \
+    src/dosfs/dosfs.h
 endif
 
-EXTRA_DIST += $(UNUSED_FILES)
-
 all-local: $(PREINSTALL_FILES)
 
 # ---
 
-PREINSTALL_DIRS =
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/rtems/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
-	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/imfs.h: src/imfs/imfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/imfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/imfs.h
-
-if !UNIX
-$(PROJECT_INCLUDE)/rtems/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/dosfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h
-endif
-
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
 include $(top_srcdir)/automake/local.am