--- gforth/Makefile.in 2008/04/25 22:17:17 1.397 +++ gforth/Makefile.in 2008/07/15 09:30:12 1.407 @@ -129,6 +129,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ #read-only architecture-dependent non-ascii files libdir = @libdir@ +libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/ includedir = @includedir@ infodir = @infodir@ htmldir = @htmldir@ @@ -255,7 +256,9 @@ GFORTH_FI_SRC = \ arch/mips/testasm.fs arch/mips/testdisasm.fs \ arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ +LIBCC_SRC = libffi.fs fflib.fs unix/socket.fs + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ @@ -275,7 +278,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ - add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \ + add.fs lib.fs oldlib.fs sieve.fs \ endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ @@ -394,65 +397,6 @@ 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 preforth.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ @@ -472,8 +416,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 +499,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 +517,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,7 +525,6 @@ 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 \ @@ -601,7 +541,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 @@ -676,11 +615,12 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) + for i in $(LIBCC_SRC); do $(DESTDIR)$(bindir)/gforth -e "s\" $(DESTDIR)$(libccdir)\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info @@ -689,7 +629,7 @@ install-strip: install installdirs: mkinstalldirs $(NORMAL_INSTALL) - for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \ + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done for i in $(CVSDIRS); do \ @@ -704,13 +644,19 @@ uninstall: FORCE -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION) @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" -check: gforths gforth.fi +check-libcc-named: $(LIBCC_SRC) + $(RMTREE) lib/gforth/$(VERSION)/libcc-named/ + $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/ + for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done + +check: gforths gforth.fi $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + $(MAKE) check-libcc-named @echo "*** Check successful ***" ./gforth-fast --diag -e bye @@ -819,7 +765,7 @@ kernl64l$(EC).fi: $(KERNLS) # -$(CP) $< $@ gforth.fi: $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -832,7 +778,7 @@ prim-fast.b: prim cache-fast$(STACK_CACH sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs - GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast + GFORTH="$(PREFORTH)" $(srcdir)/gfgen -fast $(FORTH_GEN_ENGINE): prim.b prims2x.fs GFORTH="$(PREFORTH)" $(srcdir)/gfgen @@ -860,7 +806,7 @@ MAKELINE-noll-reg = OPT=-noll-reg OPTDEF MAKELINE-ll = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS= MAKELINE-noll = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o -gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h +gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h $(kernel_fi) if test -z "$(OPT)"; then \ for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \ else \ @@ -1037,7 +983,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 +995,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 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 +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 engine/libcc.h.in ./config.status config.status: configure