--- gforth/Makefile.in	2008/04/20 20:21:24	1.396
+++ gforth/Makefile.in	2008/05/04 17:53:29	1.398
@@ -66,7 +66,7 @@ INSTALL_INFO = @INSTALL_INFO@
 LN_S	= @LN_S@
 M4      = @M4@
 GCC	= @CC@
-PREFORTH	= @PREFORTH@ -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
+PREFORTH	= ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 CC	= $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@
@@ -394,67 +394,8 @@ ENGINE_SOURCES = engine/Makefile.in engi
 	engine/fnmatch.h engine/fnmatch.c \
 	engine/makefile.dos engine/makefile.os2
 
-LIBLTDL = \
-	libltdl/argz.c \
-	libltdl/loaders/dlopen.c \
-	libltdl/loaders/shl_load.c \
-	libltdl/loaders/dld_link.c \
-	libltdl/loaders/dyld.c \
-	libltdl/loaders/preopen.c \
-	libltdl/loaders/load_add_on.c \
-	libltdl/loaders/loadlibrary.c \
-	libltdl/configure.ac \
-	libltdl/configure \
-	libltdl/slist.c \
-	libltdl/aclocal.m4 \
-	libltdl/config/config.guess \
-	libltdl/config/mkstamp \
-	libltdl/config/missing \
-	libltdl/config/install-sh \
-	libltdl/config/ltmain.m4sh \
-	libltdl/config/depcomp \
-	libltdl/config/getopt.m4sh \
-	libltdl/config/texinfo.tex \
-	libltdl/config/compile \
-	libltdl/config/mdate-sh \
-	libltdl/config/config.sub \
-	libltdl/config/general.m4sh \
-	libltdl/config/ltmain.sh \
-	libltdl/README \
-	libltdl/lt__dirent.c \
-	libltdl/ltdl.h \
-	libltdl/m4/argz.m4 \
-	libltdl/m4/ltdl.m4 \
-	libltdl/m4/libtool.m4 \
-	libltdl/m4/ltsugar.m4 \
-	libltdl/m4/lt~obsolete.m4 \
-	libltdl/m4/ltoptions.m4 \
-	libltdl/m4/ltversion.in \
-	libltdl/m4/ltversion.m4 \
-	libltdl/Makefile.am \
-	libltdl/lt__strl.c \
-	libltdl/config-h.in \
-	libltdl/ltdl.c \
-	libltdl/lt__alloc.c \
-	libltdl/argz_.h \
-	libltdl/lt_error.c \
-	libltdl/Makefile.inc \
-	libltdl/lt_dlloader.c \
-	libltdl/stamp-mk \
-	libltdl/libltdl/lt_system.h \
-	libltdl/libltdl/lt__private.h \
-	libltdl/libltdl/lt__alloc.h \
-	libltdl/libltdl/lt_dlloader.h \
-	libltdl/libltdl/lt_error.h \
-	libltdl/libltdl/slist.h \
-	libltdl/libltdl/lt__glibc.h \
-	libltdl/libltdl/lt__strl.h \
-	libltdl/libltdl/lt__dirent.h \
-	libltdl/COPYING.LIB \
-	libltdl/Makefile.in
-
 SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
-	gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \
+	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
 	configure.in configure config.sub config.guess elisp-comp missing \
 	stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
@@ -472,8 +413,7 @@ SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) c
 	$(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
 	timings.sc \
 	test/coretest.out test/checkans.out test/gforth.out \
-	cache*.vmg peeprules.vmg prim \
-	$(LIBLTDL)
+	cache*.vmg peeprules.vmg prim
 
 RCS_FILES =  ToDo model high-level
 
@@ -556,7 +496,6 @@ more:	$(ENGINES) $(FORTH_GEN) $(GEN)
 # `realclean' also deletes everything that could be regenerated automatically."
 
 mostlyclean:	FORCE
-		cd libltdl && make mostlyclean
 		-$(RM) -rf engine/*.s gforth.fi *.fi~ *.fi- kernel/version.fs \
 		*TAGS gforth~ \
 		doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \
@@ -575,7 +514,6 @@ docclean:	FORCE
 		doc/gforth.toc doc/gforth.tp doc/gforth.vr html
 
 clean:		mostlyclean
-	cd libltdl && make clean
 	-$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
 	gforth-itc-noll$(EC)$(EXE)  engine/gforth-itc-noll$(EC)$(EXE)  \
 	gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \
@@ -584,11 +522,10 @@ clean:		mostlyclean
 	for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done
 
 distclean:	clean
-		cd libltdl && make distclean
 		-$(RM) -rf config.cache config.log config.status \
 		engine/config.h Makefile Makedist engine/Makefile \
 		stamp-h engine/stamp-h \
-		doc/version.texi gforthmi vmgen \
+		doc/version.texi gforthmi vmgen preforth \
 		prim-fast.b $(FORTH_GEN_ENGINE_FAST)
 
 #realclean is useless, but dangerous, so it's commented out
@@ -601,7 +538,6 @@ virtualclean:	mostlyclean
 		gforth-$(VERSION).tar.gz config.cache *~ */*~
 
 maintainer-clean: realclean
-		cd libltdl && maintainer-clean
 
 #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the
 #Makefile if it contains our dist rules.  Therefore we have put these
@@ -1037,7 +973,7 @@ configure: configure.in aclocal.m4
 	cd $(srcdir) && autoconf
 
 aclocal.m4:	configure.in
-		aclocal -I libltdl/m4
+		aclocal
 
 # autoheader might not change config.h.in, so touch a stamp file.
 engine/config.h.in: stamp-h.in
@@ -1049,7 +985,7 @@ engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status stamp-h.in
 	./config.status
 
-Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in
+Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec:	Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in
 	./config.status
 
 config.status: configure