28 files changed, 10 insertions, 79 deletions
diff --git a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h b/cpukit/include/librtemsNfs.h
index 530eee2144..530eee2144 100644
--- a/cpukit/libfs/src/nfsclient/src/librtemsNfs.h
+++ b/cpukit/include/librtemsNfs.h
diff --git a/cpukit/libfs/src/devfs/devfs.h b/cpukit/include/rtems/devfs.h
index b0a9197eca..b0a9197eca 100644
--- a/cpukit/libfs/src/devfs/devfs.h
+++ b/cpukit/include/rtems/devfs.h
diff --git a/cpukit/libfs/src/dosfs/dosfs.h b/cpukit/include/rtems/dosfs.h
index 7691ed7e43..7691ed7e43 100644
--- a/cpukit/libfs/src/dosfs/dosfs.h
+++ b/cpukit/include/rtems/dosfs.h
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/include/rtems/imfs.h
index fe3c5b12a9..fe3c5b12a9 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/include/rtems/imfs.h
diff --git a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h b/cpukit/include/rtems/jffs2.h
index a856c46c41..a856c46c41 100644
--- a/cpukit/libfs/src/jffs2/include/rtems/jffs2.h
+++ b/cpukit/include/rtems/jffs2.h
diff --git a/cpukit/libfs/src/pipe/pipe.h b/cpukit/include/rtems/pipe.h
index 7c6566ad50..7c6566ad50 100644
--- a/cpukit/libfs/src/pipe/pipe.h
+++ b/cpukit/include/rtems/pipe.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
index 5574339421..5574339421 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-bitmaps.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-bitmaps.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
index 7d0f0693be..7d0f0693be 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block-pos.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-block-pos.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-block.h b/cpukit/include/rtems/rfs/rtems-rfs-block.h
index 394853b7ad..394853b7ad 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-block.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-block.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h
index 1c603e1827..1c603e1827 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-buffer.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-buffer.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-data.h b/cpukit/include/rtems/rfs/rtems-rfs-data.h
index 6217e74587..6217e74587 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-data.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-data.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
index d9a8a2004f..d9a8a2004f 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir-hash.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-dir-hash.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-dir.h b/cpukit/include/rtems/rfs/rtems-rfs-dir.h
index ae3647d03c..ae3647d03c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-dir.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-dir.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
index e239c25d6f..e239c25d6f 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system-fwd.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system-fwd.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h
index e00b142532..e00b142532 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file-system.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file.h b/cpukit/include/rtems/rfs/rtems-rfs-file.h
index 772e846143..772e846143 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-file.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-file.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-group.h b/cpukit/include/rtems/rfs/rtems-rfs-group.h
index 23e6434b2c..23e6434b2c 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-group.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-group.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-inode.h b/cpukit/include/rtems/rfs/rtems-rfs-inode.h
index 95861ea8a7..95861ea8a7 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-inode.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-inode.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-link.h b/cpukit/include/rtems/rfs/rtems-rfs-link.h
index d30814aaff..d30814aaff 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-link.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-link.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h
index 606fd53233..606fd53233 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-mutex.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-trace.h b/cpukit/include/rtems/rfs/rtems-rfs-trace.h
index 4d6d0c9ddb..4d6d0c9ddb 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.h
+++ b/cpukit/include/rtems/rfs/rtems-rfs-trace.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-format.h b/cpukit/include/rtems/rtems-rfs-format.h
index f65cce1789..f65cce1789 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-format.h
+++ b/cpukit/include/rtems/rtems-rfs-format.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.h b/cpukit/include/rtems/rtems-rfs-shell.h
index c2e1108a47..c2e1108a47 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs-shell.h
+++ b/cpukit/include/rtems/rtems-rfs-shell.h
diff --git a/cpukit/libfs/src/rfs/rtems-rfs.h b/cpukit/include/rtems/rtems-rfs.h
index 958f9a636b..958f9a636b 100644
--- a/cpukit/libfs/src/rfs/rtems-rfs.h
+++ b/cpukit/include/rtems/rtems-rfs.h
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index 0985b2ffb4..a76fa8ae2d 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -112,6 +112,11 @@ librfs_a_SOURCES = \
 
 # JFFS2
 project_lib_LIBRARIES = libjffs2.a
+
+$(PROJECT_LIB)/libjffs2.a: libjffs2.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libjffs2.a
+
 libjffs2_a_SOURCES =
 libjffs2_a_SOURCES += src/jffs2/src/build.c
 libjffs2_a_SOURCES += src/jffs2/src/compat-crc32.c
@@ -139,6 +144,5 @@ libjffs2_a_CPPFLAGS += -D__ECOS
 libjffs2_a_CPPFLAGS += '-DKBUILD_MODNAME="JFFS2"'
 
 # ---
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/preinstall.am b/cpukit/libfs/preinstall.am
deleted file mode 100644
index 2aca1ef32f..0000000000
--- a/cpukit/libfs/preinstall.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES = $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/libjffs2.a: libjffs2.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libjffs2.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libjffs2.a
-
diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am
index 85f4a71756..04d840f507 100644
--- a/cpukit/libfs/src/nfsclient/Makefile.am
+++ b/cpukit/libfs/src/nfsclient/Makefile.am
@@ -10,6 +10,11 @@ dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 if LIBNETWORKING
 project_lib_LIBRARIES = libnfs.a
 
+$(PROJECT_LIB)/libnfs.a: libnfs.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
+TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a
+
+
 # if you have CEXP set this variable to 'YES'
 # and some "help" info will be compiled in.
 libnfs_a_SOURCES = src/rpcio.c src/rpcio.h
@@ -19,8 +24,6 @@ libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h
 # With CEXP
 # libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c
 
-include_HEADERS = src/librtemsNfs.h
-
 # PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj
 
 libnfs_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,5 +69,4 @@ $(srcdir)/proto/nfs_prot_xdr.c: proto/nfs_prot.x proto/nfs_prot.h
 	> nfs_prot_xdr.c)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/nfsclient/preinstall.am b/cpukit/libfs/src/nfsclient/preinstall.am
deleted file mode 100644
index 593fc0367d..0000000000
--- a/cpukit/libfs/src/nfsclient/preinstall.am
+++ /dev/null
@@ -1,51 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES = $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_LIB)/dirutils.rel: dirutils.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/dirutils.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/dirutils.rel
-
-if LIBNETWORKING
-$(PROJECT_LIB)/libnfs.a: libnfs.a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a
-
-$(PROJECT_INCLUDE)/librtemsNfs.h: src/librtemsNfs.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/librtemsNfs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/librtemsNfs.h
-
-$(PROJECT_LIB)/nfs.rel: nfs.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/nfs.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/nfs.rel
-
-$(PROJECT_LIB)/rpcio.rel: rpcio.rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/rpcio.rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/rpcio.rel
-endif