diff --git a/src/Makefile.in b/src/Makefile.in
index 9f96afddcc5fd2131d4c778b538cfe46071a4369..8280acd73cc2984a2bd551f9bc9968d7586a7e04 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.347 2003/02/10 21:04:23 nilsson Exp $
+# $Id: Makefile.in,v 1.348 2003/02/19 23:58:20 mast Exp $
 #
 
 # This line is needed on some machines.
@@ -106,10 +106,8 @@ LD=@LD@
 LDFLAGS=@LDFLAGS@ @LINKFORSHARED@ $(EXTRALDFLAGS)
 
 DEFAULT_RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
-USE_TPIKE=$(TMP_BUILDDIR)/precompile.sh
 USE_PIKE=pike $(PIKEOPTS)
 RUNPIKE=$(@RUNPIKE@)
-RUNTPIKE=$(@RUNTPIKE@)
 PIKE_MODULE_RELOC=@PIKE_MODULE_RELOC@
 
 # Set to an appropriate invocation of valgrind (or similar)
@@ -166,7 +164,12 @@ OBJ= \
  queue.o \
  builtin.o \
  iterators.o \
- svalue.o @EXTRA_OBJS@
+ svalue.o \
+ las.o \
+ builtin_functions.o \
+ peep.o \
+ module.o \
+ @EXTRA_OBJS@
 
 MODULE_REQUIREMENTS= \
   machine.h \
@@ -183,19 +186,10 @@ SRC_TARGETS= \
  $(SRCDIR)/language.h \
  $(SRCDIR)/interpret_protos.h \
  $(SRCDIR)/interpret_functions_fixed.h \
- @PMOD_TARGETS@
-
-TPIKE_TARGETS= \
  $(SRCDIR)/peep_engine.c \
  $(SRCDIR)/case_info.h \
  $(SRCDIR)/treeopt.h \
-
-#
-# The following objectfiles differ between tpike & pike:
-#
-
-TOBJ = las_t.o builtin_functions_t.o peep_t.o  module_t.o
-POBJ = las.o builtin_functions.o peep.o module.o
+ @PMOD_TARGETS@
 
 
 #
@@ -257,34 +251,11 @@ compiler-warnings : clean
 	@echo 'End of summary'
 	@echo '--------------'
 
-tpike-real: $(SRC_TARGETS) $(OBJ) $(TOBJ) modules/linker_options
-	-@rm -f tpike || :
-	$(LD) $(LDFLAGS) $(OBJ) $(TOBJ) `cat modules/linker_options` $(LIBS) -o tpike
-
-# Only want tpike to exist when using $(RUNTPIKE); we don't want to
-# require it actually being up-to-date.
-#
-# If RUNPIKE has been overridden we don't bother to build tpike. The
-# precompile.sh script will then fall back to use RUNPIKE when it
-# doesn't find tpike, and we assume that RUNPIKE doesn't point to a
-# pike from the stone age.
-$(TMP_BUILDDIR)/tpike: precompile.sh-stamp
-	@if test "x$(RUNPIKE)" = "x$(DEFAULT_RUNPIKE)"; then \
-	  $(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) tpike-real; \
-	else :; fi
-
-# Make $(POBJ)s with a recursive make instead of depending on them.
-# This way, we make sure that all other objects shared with tpike are
-# up-to-date first. So if the $(POBJ)s, which depend on tpike, trigs
-# the recursive make of tpike-real above, that one will never start to
-# make the $(OBJ)s concurrently with this one. stamp-tpike-predep
-# records the $(POBJ) dependencies without tpike.
-pike: $(OBJ) master-stamp pike.syms modules/linker_options stamp-tpike-predep post_modules/linker_options
-	$(MAKE) $(MAKE_FLAGS) $(MAKE_PARALLEL) $(POBJ)
+pike: $(OBJ) master-stamp pike.syms modules/linker_options post_modules/linker_options
 	-@if [ -f pike.old ] ; then rm -f pike.old || : ; else : ; fi
 	-@if [ -f pike.old.exe ] ; then rm -f pike.old.exe || : ; else : ; fi
 	-@if [ -f pike ] ; then mv pike pike.old || : ; else : ; fi
-	$(LD) $(LDFLAGS) $(OBJ) $(POBJ) `cat modules/linker_options post_modules/linker_options` $(LIBS) -o pike
+	$(LD) $(LDFLAGS) $(OBJ) `cat modules/linker_options post_modules/linker_options` $(LIBS) -o pike
 # The dumped modules are removed whenever Pike is relinked since some
 # of the bytecode methods (e.g. ia32) stores absolute addresses to
 # global structs. That should probably be fixed in them so that dumped
@@ -292,19 +263,19 @@ pike: $(OBJ) master-stamp pike.syms modules/linker_options stamp-tpike-predep po
 	if [ -f dumpversion ]; then $(MAKE) $(MAKE_FLAGS) delete_dumped_modules; else :; fi
 
 # purify
-pure: $(OBJ) $(POBJ) master-stamp module_objects
+pure: $(OBJ) master-stamp module_objects
 	-@mv pike pike.old 2>/dev/null || true
-	$(SMARTLINK) purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) $(POBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
+	$(SMARTLINK) purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
 
 # purecov
-cover: $(OBJ) $(POBJ) master-stamp module_objects
+cover: $(OBJ) master-stamp module_objects
 	-@mv pike pike.old 2>/dev/null || true
-	$(SMARTLINK) purecov purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) $(POBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
+	$(SMARTLINK) purecov purify -max-threads=128 -thread_stack_change=8192 -free-queue-length=500 -inuse-at-exit=yes -chain-length=12 $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
 
 # quantify
-quant: $(OBJ) $(POBJ) master-stamp module_objects
+quant: $(OBJ) master-stamp module_objects
 	-@mv pike pike.old 2>/dev/null || true
-	$(SMARTLINK) quantify $(REALCC) $(LDFLAGS) $(OBJ) $(POBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
+	$(SMARTLINK) quantify $(REALCC) $(LDFLAGS) $(OBJ) `cat modules/linker_options  post_modules/linker_options` $(LIBS) -o pike
 
 atom: pike
 	atom pike -tool atom -env threads -g -v `find lib/modules -type f -name '*.so' -print | sed -e 's/^/-incobj /g'`
@@ -452,7 +423,7 @@ clean: tidy
 	-rm testsuite_test.pike testsuite.tmp
 	-rm -f TAGS tags yacc.acts yacc.debug yacc.tmp *.debug.log a.out
 	-rm -f hilfe rsif master.pike compiler-warnings
-	-rm -f tpike stamp-tpike-predep import-stamp modules-stamp master-stamp
+	-rm -f import-stamp modules-stamp master-stamp
 	-rm -rf lib/modules/*
 #	-rm -f lib/master.pike
 
@@ -727,23 +698,23 @@ bin_export:
 #	$(RUNPIKE) $(TMP_BINDIR)/mkpeep.pike $(SRCDIR)/peep.in >$(SRCDIR)/peep_engine.c
 #	$(RUNPIKE) $(TMP_BINDIR)/make_ci.pike <$(SRCDIR)/UnicodeData.txt >$(SRCDIR)/case_info.h
 
-$(SRCDIR)/peep_engine.c: $(TMP_BUILDDIR)/tpike $(SRCDIR)/peep.in $(TMP_BINDIR)/mkpeep.pike
-	$(RUNTPIKE) $(TMP_BINDIR)/mkpeep.pike $(SRCDIR)/peep.in >$(SRCDIR)/peep_engine.c || ( rm $(SRCDIR)/peep_engine.c ; exit 1 )
+$(SRCDIR)/peep_engine.c: $(SRCDIR)/peep.in $(TMP_BINDIR)/mkpeep.pike
+	./precompile.sh $(TMP_BINDIR)/mkpeep.pike $(SRCDIR)/peep.in >$(SRCDIR)/peep_engine.c || ( rm $(SRCDIR)/peep_engine.c ; exit 1 )
 
 peep.o: $(SRCDIR)/peep_engine.c
 
 peep_t.o: peep.c
 
-$(SRCDIR)/case_info.h: $(TMP_BUILDDIR)/tpike $(SRCDIR)/UnicodeData.txt $(TMP_BINDIR)/make_ci.pike
-	$(RUNTPIKE) $(TMP_BINDIR)/make_ci.pike $(SRCDIR)/case_info.h \
+$(SRCDIR)/case_info.h: $(SRCDIR)/UnicodeData.txt $(TMP_BINDIR)/make_ci.pike
+	./precompile.sh $(TMP_BINDIR)/make_ci.pike $(SRCDIR)/case_info.h \
 	  <$(SRCDIR)/UnicodeData.txt
 
 builtin_functions.o: $(SRCDIR)/case_info.h $(SRCDIR)/combine_path.h
 
 builtin_functions_t.o: builtin_functions.c $(SRCDIR)/combine_path.h
 
-$(SRCDIR)/treeopt.h: $(TMP_BUILDDIR)/tpike $(SRCDIR)/treeopt.in $(TMP_BINDIR)/mktreeopt.pike
-	$(RUNTPIKE) $(TMP_BINDIR)/mktreeopt.pike $(SRCDIR)/treeopt.in || ( rm $(SRCDIR)/treeopt.h ; exit 1 )
+$(SRCDIR)/treeopt.h: $(SRCDIR)/treeopt.in $(TMP_BINDIR)/mktreeopt.pike
+	./precompile.sh $(TMP_BINDIR)/mktreeopt.pike $(SRCDIR)/treeopt.in || ( rm $(SRCDIR)/treeopt.h ; exit 1 )
 
 las.o: $(SRCDIR)/treeopt.h
 
@@ -773,12 +744,8 @@ interpreter_debug.h: interpreter.h
 
 interpret.o: interpreter_debug.h $(SRCDIR)/interpret_functions_fixed.h
 
-# All the $(POBJ) dependencies, except tpike. See blurb at pike target.
-stamp-tpike-predep: $(SRCDIR)/peep.in $(TMP_BINDIR)/mkpeep.pike peep.c $(SRCDIR)/UnicodeData.txt $(TMP_BINDIR)/make_ci.pike builtin_functions.c $(SRCDIR)/treeopt.in $(TMP_BINDIR)/mktreeopt.pike las.c
-	@echo foo > stamp-tpike-predep
-
 # make dependencies
-depend: $(SRC_TARGETS) $(TPIKE_TARGETS)
+depend: $(SRC_TARGETS)
 	gcc -MM -MG $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh "$(SRCDIR)" "$(SRCDIR)" /dev/null
 	-@(while :; do \
 	  echo foo > cfl.$@; test "`echo cfl.*`" = cfl.$@ && break; \
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3b2de8055a497af1464e6102fc44d9a1f173174f..06b9a163fc7fed1194862b981560947cec03186a 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.60 2003/02/14 19:52:00 mast Exp $
+dnl $Id: aclocal.m4,v 1.61 2003/02/19 23:58:20 mast Exp $
 
 dnl Some compatibility with Autoconf 2.50+. Not complete.
 dnl newer Autoconf calls substr m4_substr
@@ -263,7 +263,7 @@ define(PIKE_FEATURE_OK,[
 
 define([AC_LOW_MODULE_INIT],
 [
-# $Id: aclocal.m4,v 1.60 2003/02/14 19:52:00 mast Exp $
+# $Id: aclocal.m4,v 1.61 2003/02/19 23:58:20 mast Exp $
 
 MY_AC_PROG_CC
 
@@ -311,16 +311,10 @@ AC_SUBST(CROSS)
 
 if test "x$enable_binary" = "xno"; then
   RUNPIKE="USE_PIKE"
-  RUNTPIKE="USE_PIKE"
-elif test "x$ac_cv_prog_cc_cross" = "xyes"; then
-  RUNPIKE="DEFAULT_RUNPIKE"
-  RUNTPIKE="USE_PIKE"
 else
   RUNPIKE="DEFAULT_RUNPIKE"
-  RUNTPIKE="USE_TPIKE"
 fi
 AC_SUBST(RUNPIKE)
-AC_SUBST(RUNTPIKE)
 ])
 
 
diff --git a/src/configure.in b/src/configure.in
index c3d6d6d644a4d994f5a2c5ff1e4a312cad7c077f..e24a290c3611e469e1430e84d21da0cb6d10a7ef 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.692 2003/02/19 23:54:30 mast Exp $")
+AC_REVISION("$Id: configure.in,v 1.693 2003/02/19 23:58:20 mast Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -459,16 +459,10 @@ AC_SUBST(CROSS)
 if test "x$enable_binary" = "xno"; then
   CC="$BINDIR/nobinary_dummy cc"
   RUNPIKE="USE_PIKE"
-  RUNTPIKE="USE_PIKE"
-elif test "x$ac_cv_prog_cc_cross" = "xyes"; then
-  RUNPIKE="DEFAULT_RUNPIKE"
-  RUNTPIKE="USE_PIKE"
 else
   RUNPIKE="DEFAULT_RUNPIKE"
-  RUNTPIKE="USE_TPIKE"
 fi
 AC_SUBST(RUNPIKE)
-AC_SUBST(RUNTPIKE)
 
 #############################################################################
 if test "x$enable_binary" != "xno"; then
diff --git a/src/make_variables.in b/src/make_variables.in
index f932e357055c4af3cb00a3e0f66693f2a6bc661b..6911ee847786cdfbe4b36f978823341cc9dc374e 100644
--- a/src/make_variables.in
+++ b/src/make_variables.in
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: make_variables.in,v 1.11 2002/09/13 01:14:26 marcus Exp $
+# $Id: make_variables.in,v 1.12 2003/02/19 23:58:21 mast Exp $
 #
 # Note: This template is actually used only for make_variables in the
 # subdirectories; the one created in the build base dir is just an
@@ -20,10 +20,8 @@ PIKE_SRC_DIR=@PIKE_SRC_DIR@
 BUILD_BASE=@BUILD_BASE@
 
 DEFAULT_RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
-USE_TPIKE=$(TMP_BUILDDIR)/precompile.sh
 USE_PIKE=pike $(PIKEOPTS)
 RUNPIKE=$(@RUNPIKE@)
-RUNTPIKE=$(@RUNTPIKE@)
 
 OPTIMIZE=@OPTIMIZE@
 INSTALL=@INSTALL@
diff --git a/src/precompile.sh.in b/src/precompile.sh.in
index 095b72af100b5fd6a0c2eb326ca175a8685c9680..8ab5766fe74a42c3bea337d2ff5557f6f5857057 100644
--- a/src/precompile.sh.in
+++ b/src/precompile.sh.in
@@ -90,30 +90,27 @@ case $method in
     RUNPIKE="$TMP_BUILDDIR/pike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$TMP_BUILDDIR/master.pike $PIKEOPTS"
   ;;
   QQ)
-    RUNPIKE="$TMP_BUILDDIR/tpike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$TMP_BUILDDIR/master.pike $PIKEOPTS"
-  ;;
-  QQQ)
     RUNPIKE=$TMP_BUILDDIR/test-pike
   ;;
-  QQQQ)
+  QQQ)
     if test x"$OLD_RUNPIKE" != x; then
       LAST_PIKE="$OLD_RUNPIKE"
-      method=QQQQQ
+      method=QQQQ
       RUNPIKE="$OLD_RUNPIKE"
     else
       RUNPIKE=""
     fi
   ;;
-  QQQQQ)
+  QQQQ)
     LAST_PIKE=pike
-    method=QQQQQQ
+    method=QQQQQ
     RUNPIKE="$LAST_PIKE"
   ;;
-  QQQQQQ)
+  QQQQQ)
     RUNPIKE="$LAST_PIKE"
     LAST_PIKE=pike
   ;;
-  QQQQQQQ)
+  QQQQQQ)
     ifs_save="${IFS- 	}"
     IFS=" :"
     for dir in $PATH
@@ -133,13 +130,13 @@ case $method in
         fi
       done
       if [ "x$RUNPIKE" != x ]; then
-        method=QQQQQQ
+	method=QQQQQ
         break
       fi
     done
     IFS="${ifs_save}"
   ;;
-  QQQQQQQQ)
+  QQQQQQQ)
     method=
   ;;
 esac