33 files changed, 2 insertions, 10 deletions
diff --git a/cpukit/libdl/dlfcn.h b/cpukit/include/dlfcn.h
index 1ac3ba1330..1ac3ba1330 100644
--- a/cpukit/libdl/dlfcn.h
+++ b/cpukit/include/dlfcn.h
diff --git a/cpukit/libdl/include/link.h b/cpukit/include/link.h
index c93efd9e78..c93efd9e78 100644
--- a/cpukit/libdl/include/link.h
+++ b/cpukit/include/link.h
diff --git a/cpukit/libdl/include/link_elf.h b/cpukit/include/link_elf.h
index d2691b68b0..d2691b68b0 100644
--- a/cpukit/libdl/include/link_elf.h
+++ b/cpukit/include/link_elf.h
diff --git a/cpukit/libdl/dlfcn-shell.h b/cpukit/include/rtems/rtl/dlfcn-shell.h
index 9383577d25..9383577d25 100644
--- a/cpukit/libdl/dlfcn-shell.h
+++ b/cpukit/include/rtems/rtl/dlfcn-shell.h
diff --git a/cpukit/libdl/rap-shell.h b/cpukit/include/rtems/rtl/rap-shell.h
index c2d9112c0f..c2d9112c0f 100644
--- a/cpukit/libdl/rap-shell.h
+++ b/cpukit/include/rtems/rtl/rap-shell.h
diff --git a/cpukit/libdl/rap.h b/cpukit/include/rtems/rtl/rap.h
index 0b86553e2b..0b86553e2b 100644
--- a/cpukit/libdl/rap.h
+++ b/cpukit/include/rtems/rtl/rap.h
diff --git a/cpukit/libdl/rtl-allocator.h b/cpukit/include/rtems/rtl/rtl-allocator.h
index e8044ee1e8..e8044ee1e8 100644
--- a/cpukit/libdl/rtl-allocator.h
+++ b/cpukit/include/rtems/rtl/rtl-allocator.h
diff --git a/cpukit/libdl/rtl-fwd.h b/cpukit/include/rtems/rtl/rtl-fwd.h
index 4641ad5d5e..4641ad5d5e 100644
--- a/cpukit/libdl/rtl-fwd.h
+++ b/cpukit/include/rtems/rtl/rtl-fwd.h
diff --git a/cpukit/libdl/rtl-indirect-ptr.h b/cpukit/include/rtems/rtl/rtl-indirect-ptr.h
index 81503a3b45..81503a3b45 100644
--- a/cpukit/libdl/rtl-indirect-ptr.h
+++ b/cpukit/include/rtems/rtl/rtl-indirect-ptr.h
diff --git a/cpukit/libdl/rtl-obj-cache.h b/cpukit/include/rtems/rtl/rtl-obj-cache.h
index 8eacdd316b..8eacdd316b 100644
--- a/cpukit/libdl/rtl-obj-cache.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-cache.h
diff --git a/cpukit/libdl/rtl-obj-comp.h b/cpukit/include/rtems/rtl/rtl-obj-comp.h
index 34bfa6ffa1..34bfa6ffa1 100644
--- a/cpukit/libdl/rtl-obj-comp.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-comp.h
diff --git a/cpukit/libdl/rtl-obj-fwd.h b/cpukit/include/rtems/rtl/rtl-obj-fwd.h
index 2c53244316..2c53244316 100644
--- a/cpukit/libdl/rtl-obj-fwd.h
+++ b/cpukit/include/rtems/rtl/rtl-obj-fwd.h
diff --git a/cpukit/libdl/rtl-obj.h b/cpukit/include/rtems/rtl/rtl-obj.h
index 6a35a72822..6a35a72822 100644
--- a/cpukit/libdl/rtl-obj.h
+++ b/cpukit/include/rtems/rtl/rtl-obj.h
diff --git a/cpukit/libdl/rtl-sym.h b/cpukit/include/rtems/rtl/rtl-sym.h
index fe00da89d7..fe00da89d7 100644
--- a/cpukit/libdl/rtl-sym.h
+++ b/cpukit/include/rtems/rtl/rtl-sym.h
diff --git a/cpukit/libdl/rtl-trace.h b/cpukit/include/rtems/rtl/rtl-trace.h
index 4b93c8c91c..4b93c8c91c 100644
--- a/cpukit/libdl/rtl-trace.h
+++ b/cpukit/include/rtems/rtl/rtl-trace.h
diff --git a/cpukit/libdl/rtl-unresolved.h b/cpukit/include/rtems/rtl/rtl-unresolved.h
index bd4ce2a215..bd4ce2a215 100644
--- a/cpukit/libdl/rtl-unresolved.h
+++ b/cpukit/include/rtems/rtl/rtl-unresolved.h
diff --git a/cpukit/libdl/rtl.h b/cpukit/include/rtems/rtl/rtl.h
index fe9a7df081..fe9a7df081 100644
--- a/cpukit/libdl/rtl.h
+++ b/cpukit/include/rtems/rtl/rtl.h
diff --git a/cpukit/libdl/include/sys/cdefs_elf.h b/cpukit/include/sys/cdefs_elf.h
index 91903d6017..91903d6017 100644
--- a/cpukit/libdl/include/sys/cdefs_elf.h
+++ b/cpukit/include/sys/cdefs_elf.h
diff --git a/cpukit/libdl/include/sys/exec_elf.h b/cpukit/include/sys/exec_elf.h
index 4242415f54..4242415f54 100644
--- a/cpukit/libdl/include/sys/exec_elf.h
+++ b/cpukit/include/sys/exec_elf.h
diff --git a/cpukit/libdl/Makefile.am b/cpukit/libdl/Makefile.am
index b21c16750a..8b95a7d91c 100644
--- a/cpukit/libdl/Makefile.am
+++ b/cpukit/libdl/Makefile.am
@@ -1,7 +1,7 @@
-if LIBDL
-
 include $(top_srcdir)/automake/compile.am
 
+if LIBDL
+
 noinst_LIBRARIES = libdl.a
 libdl_a_SOURCES = \
   dlfcn-shell.c \
@@ -33,5 +33,4 @@ libdl_a_CPPFLAGS = $(AM_CPPFLAGS) -DRTEMS_RTL_RAP_LOADER=1 -DRTEMS_RTL_ELF_LOADE
 
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libdl/preinstall.am b/cpukit/libdl/preinstall.am
deleted file mode 100644
index dba6cc4d81..0000000000
--- a/cpukit/libdl/preinstall.am
+++ /dev/null
@@ -1,7 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
diff --git a/cpukit/libdl/include/arch/arm/machine/elf_machdep.h b/cpukit/score/cpu/arm/include/machine/elf_machdep.h
index 8f01d05212..8f01d05212 100644
--- a/cpukit/libdl/include/arch/arm/machine/elf_machdep.h
+++ b/cpukit/score/cpu/arm/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h b/cpukit/score/cpu/bfin/include/machine/elf_machdep.h
index cf0dc19221..cf0dc19221 100644
--- a/cpukit/libdl/include/arch/bfin/machine/elf_machdep.h
+++ b/cpukit/score/cpu/bfin/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/h8300/machine/elf_machdep.h b/cpukit/score/cpu/h8300/include/machine/elf_machdep.h
index 3d049157eb..3d049157eb 100644
--- a/cpukit/libdl/include/arch/h8300/machine/elf_machdep.h
+++ b/cpukit/score/cpu/h8300/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/i386/machine/elf_machdep.h b/cpukit/score/cpu/i386/include/machine/elf_machdep.h
index 442c561a9c..442c561a9c 100644
--- a/cpukit/libdl/include/arch/i386/machine/elf_machdep.h
+++ b/cpukit/score/cpu/i386/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/lm32/machine/elf_machdep.h b/cpukit/score/cpu/lm32/include/machine/elf_machdep.h
index 29c75b89db..29c75b89db 100644
--- a/cpukit/libdl/include/arch/lm32/machine/elf_machdep.h
+++ b/cpukit/score/cpu/lm32/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h
index 9a987c69b5..9a987c69b5 100644
--- a/cpukit/libdl/include/arch/m68k/machine/elf_machdep.h
+++ b/cpukit/score/cpu/m68k/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/mips/machine/elf_machdep.h b/cpukit/score/cpu/mips/include/machine/elf_machdep.h
index 26700ce4ce..26700ce4ce 100644
--- a/cpukit/libdl/include/arch/mips/machine/elf_machdep.h
+++ b/cpukit/score/cpu/mips/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/moxie/machine/elf_machdep.h b/cpukit/score/cpu/moxie/include/machine/elf_machdep.h
index 3f0df23cdc..3f0df23cdc 100644
--- a/cpukit/libdl/include/arch/moxie/machine/elf_machdep.h
+++ b/cpukit/score/cpu/moxie/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h
index 3f3c108bf5..3f3c108bf5 100644
--- a/cpukit/libdl/include/arch/nios2/machine/elf_machdep.h
+++ b/cpukit/score/cpu/nios2/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h b/cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
index f0fdb3f33b..f0fdb3f33b 100644
--- a/cpukit/libdl/include/arch/powerpc/machine/elf_machdep.h
+++ b/cpukit/score/cpu/powerpc/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/sparc/machine/elf_machdep.h b/cpukit/score/cpu/sparc/include/machine/elf_machdep.h
index e8f2b630c2..e8f2b630c2 100644
--- a/cpukit/libdl/include/arch/sparc/machine/elf_machdep.h
+++ b/cpukit/score/cpu/sparc/include/machine/elf_machdep.h
diff --git a/cpukit/libdl/include/arch/v850/machine/elf_machdep.h b/cpukit/score/cpu/v850/include/machine/elf_machdep.h
index b76d1491d6..b76d1491d6 100644
--- a/cpukit/libdl/include/arch/v850/machine/elf_machdep.h
+++ b/cpukit/score/cpu/v850/include/machine/elf_machdep.h