diff --git a/.gitattributes b/.gitattributes
index 96aed6ceb2b2edad3e5d1dbf9faae84e94d15460..c6e909023ee0a28b80f957c1b05de93e1381ea11 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -59,7 +59,7 @@ testfont binary
 /src/modules/image/pnm.c foreign_ident
 /src/modules/image/quant.c foreign_ident
 /src/modules/image/togif.c foreign_ident
-/src/modules/mysql/Makefile.src foreign_ident
+/src/modules/mysql/Makefile.in foreign_ident
 /src/modules/mysql/configure.in foreign_ident
 /src/modules/mysql/mysql.c foreign_ident
 /src/modules/mysql/precompiled_mysql.h foreign_ident
diff --git a/src/.cvsignore b/src/.cvsignore
index ddb2fab11e9daf793d4c813e9bc9c4d6315a37ef..fd68b3e776de43c085b6473582da6434762df55f 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,6 +1,6 @@
 configure
+dependencies
 language.c
 language.h
 peep_engine.c
-Makefile.in
 stamp-h
diff --git a/src/.gitignore b/src/.gitignore
index ad6f768107ac7fecb8ea7626a92236e90d714d94..bf7dde9fe27bfbf1e168df284c7a6383a0a0a082 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +1,6 @@
 /configure
+/dependencies
 /language.c
 /language.h
 /peep_engine.c
-/Makefile.in
 /stamp-h
diff --git a/src/Makefile.src b/src/Makefile.in
similarity index 97%
rename from src/Makefile.src
rename to src/Makefile.in
index 5a3c3cf75fae98dd71b1c8a8ee31ddee222e63ff..d853da01a7956e6698090c44de30ffb186c2d6ae 100644
--- a/src/Makefile.src
+++ b/src/Makefile.in
@@ -98,6 +98,7 @@ OBJ= \
  stralloc.o \
  stuff.o \
  threads.o \
+ version.o \
  svalue.o @EXTRA_OBJS@
 
 #
@@ -249,10 +250,7 @@ $(SRCDIR)/configure: configure.in
 config.status: $(SRCDIR)/configure
 	./config.status --recheck
 
-$(SRCDIR)/Makefile.in: $(SRCDIR)/Makefile.src
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-Makefile: $(SRCDIR)/Makefile.in config.status
+Makefile: $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= ./config.status
 	@echo "Run make again"
 	@exit 1
@@ -264,4 +262,4 @@ stamp-h: machine.h.in config.status
 testsuite: $(SRCDIR)/testsuite.in
 	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >testsuite
 
-
+@dependencies@
diff --git a/src/configure.in b/src/configure.in
index bc811e5f8e28de1ad669929e68b69e7fcfc337d4..377e695e44db461197f25a59ad8fb96d3aed5d14 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.41 1997/01/16 04:59:28 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.42 1997/01/18 21:48:06 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -1197,6 +1197,9 @@ my_libdir=`echo $prefix | sed "s@^NONE@$ac_default_prefix@g"`
 default_master=$my_libdir/lib/pike/master.pike
 AC_DEFINE_UNQUOTED(DEFAULT_MASTER,"$default_master")
 
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
 AC_SUBST(YACC)
 AC_SUBST(INSTALL)
 AC_SUBST(WARN)
diff --git a/src/modules/.cvsignore b/src/modules/.cvsignore
index 64200ddc24cb90d8f410a6a9e2b0b79c4cd30d58..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/.cvsignore
+++ b/src/modules/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 configure
+dependencies
diff --git a/src/modules/.gitignore b/src/modules/.gitignore
index addfc0376f648196d317f7f7299705f23cb23c21..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/.gitignore
+++ b/src/modules/.gitignore
@@ -1,2 +1,2 @@
-/Makefile.in
 /configure
+/dependencies
diff --git a/src/modules/Makefile.src b/src/modules/Makefile.in
similarity index 98%
rename from src/modules/Makefile.src
rename to src/modules/Makefile.in
index 308aab352350b3521ba304118599d17737c23119..54708a8b23e45db92a4a94d07361b51ed07f7b97 100644
--- a/src/modules/Makefile.src
+++ b/src/modules/Makefile.in
@@ -34,3 +34,5 @@ verify:
 
 verbose_verify:
 	for a in $(MODULES) ; do ( cd $$a ; ${MAKE} $(MAKE_FLAGS) verbose_verify ) ; done
+
+@dependencies@
diff --git a/src/modules/call_out/.cvsignore b/src/modules/call_out/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/call_out/.cvsignore
+++ b/src/modules/call_out/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/call_out/.gitignore b/src/modules/call_out/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/call_out/.gitignore
+++ b/src/modules/call_out/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/call_out/Makefile.in b/src/modules/call_out/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..588de186c7795eec7bf2cd672dcdb5616179f2d1
--- /dev/null
+++ b/src/modules/call_out/Makefile.in
@@ -0,0 +1,14 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+FILES=call_out.o
+
+all: call_out.a
+
+@module_makefile@
+
+call_out.a: $(FILES)
+	-rm -f call_out.a
+	ar cq call_out.a $(FILES)
+	-@RANLIB@ call_out.a
+
+@dependencies@
diff --git a/src/modules/call_out/Makefile.src b/src/modules/call_out/Makefile.src
deleted file mode 100644
index 7d641037056d958d9db8c67fdef8a0295dcba3ea..0000000000000000000000000000000000000000
--- a/src/modules/call_out/Makefile.src
+++ /dev/null
@@ -1,33 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=call_out.o
-
-call_out.a: $(FILES)
-	-rm -f call_out.a
-	ar cq call_out.a $(FILES)
-	-@RANLIB@ call_out.a
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/call_out/configure.in b/src/modules/call_out/configure.in
index ae228dce800c86dd4524a5b715255fe3a7eb943d..a6e609d9ddbf225246fdf547fad659fdab2c9ba7 100644
--- a/src/modules/call_out/configure.in
+++ b/src/modules/call_out/configure.in
@@ -3,6 +3,10 @@ AC_INIT(call_out.c)
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 AC_OUTPUT(Makefile,echo FOO >stamp-h )
 
diff --git a/src/modules/configure.in b/src/modules/configure.in
index 9c8f79d139dc93ada177b729bf21ac81e3e044d8..e8ded21a05e3a21fffd0a8ad48ebf5c038923955 100644
--- a/src/modules/configure.in
+++ b/src/modules/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(module_dir_marker)
+AC_INIT(module_makefile)
 
 AC_SET_MAKE
 
@@ -17,6 +17,8 @@ do
 done
 
 AC_SUBST(MODULE_OBJS)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
 AC_CONFIG_SUBDIRS($dirs)
 
 AC_OUTPUT(Makefile,
diff --git a/src/modules/files/.cvsignore b/src/modules/files/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/files/.cvsignore
+++ b/src/modules/files/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/files/.gitignore b/src/modules/files/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/files/.gitignore
+++ b/src/modules/files/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/files/Makefile.in b/src/modules/files/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..e654c893686aad3c4be5701b662fd20fb511b6e7
--- /dev/null
+++ b/src/modules/files/Makefile.in
@@ -0,0 +1,15 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+FILES=file.o efuns.o socket.o
+
+all: files.a
+
+@module_makefile@
+
+files.a: $(FILES)
+	-rm -f files.a
+	ar cq files.a $(FILES)
+	-@RANLIB@ files.a
+	echo >linker_options @LIBS@
+
+@dependencies@
diff --git a/src/modules/files/Makefile.src b/src/modules/files/Makefile.src
deleted file mode 100644
index be092b44fe046850d544c277b1a01bec17016196..0000000000000000000000000000000000000000
--- a/src/modules/files/Makefile.src
+++ /dev/null
@@ -1,39 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=file.o efuns.o socket.o
-
-files.a: $(FILES)
-	-rm -f files.a
-	ar cq files.a $(FILES)
-	-@RANLIB@ files.a
-	echo >linker_options @LIBS@
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-	$(RUNPIKE) @srcdir@/socktest.pike
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-	$(RUNPIKE) @srcdir@/socktest.pike
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/socktest.pike
-	gdb ../../pike
-	@rm .gdbinit
-
-
diff --git a/src/modules/files/configure.in b/src/modules/files/configure.in
index 7d095469c4737289bdc44189e5bd0e13cf42a3f4..d3d96f6fb468f7f51b71eb36e1a82a6fb0821edb 100644
--- a/src/modules/files/configure.in
+++ b/src/modules/files/configure.in
@@ -5,6 +5,10 @@ AC_PROG_CC
 AC_C_CROSS
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 AC_HAVE_HEADERS(arpa/inet.h sys/socketvar.h netinet/in.h \
  sys/stream.h sys/protosw.h netdb.h)
diff --git a/src/modules/gdbmmod/.cvsignore b/src/modules/gdbmmod/.cvsignore
index 95cf939d5375192c28f80cfe1e4cf77564f3f024..e54890b35bad93fff049963b32a7deb9efdfd80c 100644
--- a/src/modules/gdbmmod/.cvsignore
+++ b/src/modules/gdbmmod/.cvsignore
@@ -1,4 +1,3 @@
+
 configure
-Makefile.in
-configure
-Makefile.in
+dependencies
diff --git a/src/modules/gdbmmod/.gitignore b/src/modules/gdbmmod/.gitignore
index 3e601eb607884985dad19fcf78bc28ffd8704744..fa8ffddc0e5fd6d65bb83a413937c651d032206b 100644
--- a/src/modules/gdbmmod/.gitignore
+++ b/src/modules/gdbmmod/.gitignore
@@ -1,4 +1,3 @@
+
 /configure
-/Makefile.in
-/configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/gdbmmod/Makefile.in b/src/modules/gdbmmod/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..83310b82bc6134a27060a0b3924a07918c0f981a
--- /dev/null
+++ b/src/modules/gdbmmod/Makefile.in
@@ -0,0 +1,17 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+
+FILES=gdbmmod.o
+LIB=gdbmmod.a
+
+all: $(LIB)
+
+@module_makefile@
+
+$(LIB): $(FILES)
+	-rm -f $(LIB)
+	ar cq $(LIB) $(FILES)
+	-@RANLIB@ $(LIB)
+	echo >linker_options @LIBS@
+
+@dependencies@
diff --git a/src/modules/gdbmmod/Makefile.src b/src/modules/gdbmmod/Makefile.src
deleted file mode 100644
index bf59f23126d4cf74a82cdb8f3703beebeae8d15a..0000000000000000000000000000000000000000
--- a/src/modules/gdbmmod/Makefile.src
+++ /dev/null
@@ -1,35 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=gdbmmod.o
-LIB=gdbmmod.a
-
-$(LIB): $(FILES)
-	-rm -f $(LIB)
-	ar cq $(LIB) $(FILES)
-	-@RANLIB@ $(LIB)
-	echo >linker_options @LIBS@
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/gdbmmod/configure.in b/src/modules/gdbmmod/configure.in
index 9daaf33ff3f63bc4bec2f05f2b3cf516faeff2bd..6619e71f5e3aba3d21746951e122e5cae7fc41bd 100644
--- a/src/modules/gdbmmod/configure.in
+++ b/src/modules/gdbmmod/configure.in
@@ -6,6 +6,10 @@ AC_ARG_WITH(gdbm,    [  --with(out)-gdbm       GNU database manager support ],[]
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 if test x$with_gdbm = xyes; then
   AC_CHECK_HEADERS(gdbm.h)
diff --git a/src/modules/gmpmod/.cvsignore b/src/modules/gmpmod/.cvsignore
index 64200ddc24cb90d8f410a6a9e2b0b79c4cd30d58..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/gmpmod/.cvsignore
+++ b/src/modules/gmpmod/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 configure
+dependencies
diff --git a/src/modules/gmpmod/.gitignore b/src/modules/gmpmod/.gitignore
index addfc0376f648196d317f7f7299705f23cb23c21..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/gmpmod/.gitignore
+++ b/src/modules/gmpmod/.gitignore
@@ -1,2 +1,2 @@
-/Makefile.in
 /configure
+/dependencies
diff --git a/src/modules/gmpmod/Makefile.in b/src/modules/gmpmod/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..7f875d752cb8a9b5208852428a73a863e47cf0f2
--- /dev/null
+++ b/src/modules/gmpmod/Makefile.in
@@ -0,0 +1,17 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+
+FILES=mpz_glue.o
+LIB=gmpmod.a
+
+all: $(LIB)
+
+@module_makefile@
+
+$(LIB): $(FILES)
+	-rm -f $(LIB)
+	ar cq $(LIB) $(FILES)
+	-@RANLIB@ $(LIB)
+	echo >linker_options @LIBS@
+
+@dependencies@
diff --git a/src/modules/gmpmod/Makefile.src b/src/modules/gmpmod/Makefile.src
deleted file mode 100644
index 4ec8783f518d46bf18c2932209a827c6645053d7..0000000000000000000000000000000000000000
--- a/src/modules/gmpmod/Makefile.src
+++ /dev/null
@@ -1,35 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=mpz_glue.o
-LIB=gmpmod.a
-
-$(LIB): $(FILES)
-	-rm -f $(LIB)
-	ar cq $(LIB) $(FILES)
-	-@RANLIB@ $(LIB)
-	echo >linker_options @LIBS@
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/gmpmod/configure.in b/src/modules/gmpmod/configure.in
index bff26457716bebab20a5a447d42e77d12e500cf9..d68e301ed273fe0c12621bf5d86ca0a05e6b9a6a 100644
--- a/src/modules/gmpmod/configure.in
+++ b/src/modules/gmpmod/configure.in
@@ -5,6 +5,10 @@ AC_ARG_WITH(gmp,     [  --with(out)-gmp        Support bignums],[],[with_gmp=yes
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 if test x$with_gmp = xyes ; then
   AC_CHECK_HEADERS(gmp.h)
diff --git a/src/modules/image/.cvsignore b/src/modules/image/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..e8c05a6b1368bd1d5a7000db0fd7491d94f8e18d 100644
--- a/src/modules/image/.cvsignore
+++ b/src/modules/image/.cvsignore
@@ -1,2 +1 @@
 configure
-Makefile.in
diff --git a/src/modules/image/.gitignore b/src/modules/image/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..55902085e884bf4ab49e1d9fdd5bdcc740d1f025 100644
--- a/src/modules/image/.gitignore
+++ b/src/modules/image/.gitignore
@@ -1,2 +1 @@
 /configure
-/Makefile.in
diff --git a/src/modules/image/Makefile.in b/src/modules/image/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..389cb503ab03a6a6ac4c301edc5d567c646615df
--- /dev/null
+++ b/src/modules/image/Makefile.in
@@ -0,0 +1,23 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+
+all: image.a
+
+@module_makefile@
+
+FILES =	image.o font.o quant.o lzw.o togif.o matrix.o pnm.o blit.o \
+	pattern.o dct.o operator.o
+
+image.a: $(FILES)
+	-rm -f image.a
+	ar cq image.a $(FILES)
+	-@RANLIB@ image.a
+
+pike: image.a
+	cd ../..; make
+
+pure: image.a
+	cd ../..; make pure
+
+
+@dependencies@
diff --git a/src/modules/image/Makefile.src b/src/modules/image/Makefile.src
deleted file mode 100644
index cfb2140ca2d20a7d0b8217d94536f575d468b450..0000000000000000000000000000000000000000
--- a/src/modules/image/Makefile.src
+++ /dev/null
@@ -1,41 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @DEFS@
-
-FILES =	image.o font.o quant.o lzw.o togif.o matrix.o pnm.o blit.o \
-	pattern.o dct.o operator.o
-
-image.a: $(FILES)
-	-rm -f image.a
-	ar cq image.a $(FILES)
-	-@RANLIB@ image.a
-
-clean:
-	-rm -f *.o *.a
-
-pike: image.a
-	cd ../..; make
-
-pure: image.a
-	cd ../..; make pure
-
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in | sed "s@SRCDIR@$(SRCDIR)@g" >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/image/configure.in b/src/modules/image/configure.in
index 36b2dd8b648df04927327acbc82945cc92838dcc..ad476e41ff2dfbb2739a6e040e888820e4db1dd1 100644
--- a/src/modules/image/configure.in
+++ b/src/modules/image/configure.in
@@ -2,6 +2,10 @@ AC_INIT(image.c)
 
 AC_PROG_CC
 AC_PROG_RANLIB
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 AC_CHECK_HEADERS(sys/fcntl.h fcntl.h stdlib.h)
 
diff --git a/src/modules/image/dependencies b/src/modules/image/dependencies
deleted file mode 100644
index d6a94c7519619afd3e91fd8cbc684b4daa0ab62c..0000000000000000000000000000000000000000
--- a/src/modules/image/dependencies
+++ /dev/null
@@ -1,53 +0,0 @@
-font.o: /home/hubbe/pike/src/modules/image/font.c \
- /home/hubbe/pike/src/modules/image/global.h machine.h \
- /home/hubbe/pike/src/modules/image/config.h \
- /home/hubbe/pike/src/modules/image/port.h \
- /home/hubbe/pike/src/modules/image/stralloc.h \
- /home/hubbe/pike/src/modules/image/macros.h \
- /home/hubbe/pike/src/modules/image/object.h \
- /home/hubbe/pike/src/modules/image/svalue.h \
- /home/hubbe/pike/src/modules/image/constants.h \
- /home/hubbe/pike/src/modules/image/hashtable.h \
- /home/hubbe/pike/src/modules/image/las.h \
- /home/hubbe/pike/src/modules/image/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/image/program.h \
- /home/hubbe/pike/src/modules/image/interpret.h \
- /home/hubbe/pike/src/modules/image/array.h \
- /home/hubbe/pike/src/modules/image/image.h
-image.o: /home/hubbe/pike/src/modules/image/image.c \
- /home/hubbe/pike/src/modules/image/stralloc.h \
- /home/hubbe/pike/src/modules/image/types.h machine.h \
- /home/hubbe/pike/src/modules/image/global.h \
- /home/hubbe/pike/src/modules/image/config.h \
- /home/hubbe/pike/src/modules/image/port.h \
- /home/hubbe/pike/src/modules/image/macros.h \
- /home/hubbe/pike/src/modules/image/object.h \
- /home/hubbe/pike/src/modules/image/svalue.h \
- /home/hubbe/pike/src/modules/image/constants.h \
- /home/hubbe/pike/src/modules/image/hashtable.h \
- /home/hubbe/pike/src/modules/image/las.h \
- /home/hubbe/pike/src/modules/image/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/image/program.h \
- /home/hubbe/pike/src/modules/image/interpret.h \
- /home/hubbe/pike/src/modules/image/array.h \
- /home/hubbe/pike/src/modules/image/error.h \
- /home/hubbe/pike/src/modules/image/image.h
-lzw.o: /home/hubbe/pike/src/modules/image/lzw.c \
- /home/hubbe/pike/src/modules/image/lzw.h
-quant.o: /home/hubbe/pike/src/modules/image/quant.c \
- /home/hubbe/pike/src/modules/image/types.h machine.h \
- /home/hubbe/pike/src/modules/image/image.h \
- /home/hubbe/pike/src/modules/image/error.h \
- /home/hubbe/pike/src/modules/image/svalue.h \
- /home/hubbe/pike/src/modules/image/global.h \
- /home/hubbe/pike/src/modules/image/config.h \
- /home/hubbe/pike/src/modules/image/port.h
-togif.o: /home/hubbe/pike/src/modules/image/togif.c \
- /home/hubbe/pike/src/modules/image/stralloc.h \
- /home/hubbe/pike/src/modules/image/types.h machine.h \
- /home/hubbe/pike/src/modules/image/global.h \
- /home/hubbe/pike/src/modules/image/config.h \
- /home/hubbe/pike/src/modules/image/port.h \
- /home/hubbe/pike/src/modules/image/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/image/image.h \
- /home/hubbe/pike/src/modules/image/lzw.h
diff --git a/src/modules/math/.cvsignore b/src/modules/math/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/math/.cvsignore
+++ b/src/modules/math/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/math/.gitignore b/src/modules/math/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/math/.gitignore
+++ b/src/modules/math/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/math/Makefile.in b/src/modules/math/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..669fb7a76a75405761e78732977d5d88245f4b11
--- /dev/null
+++ b/src/modules/math/Makefile.in
@@ -0,0 +1,16 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+
+FILES=math.o
+
+all: math.a
+
+@module_makefile@
+
+math.a: $(FILES)
+	-rm -f math.a
+	ar cq math.a $(FILES)
+	-@RANLIB@ math.a
+	echo >linker_options @LIBS@
+
+@dependencies@
diff --git a/src/modules/math/Makefile.src b/src/modules/math/Makefile.src
deleted file mode 100644
index 6a15780545fec97d726eed4843a2cb6badb1906e..0000000000000000000000000000000000000000
--- a/src/modules/math/Makefile.src
+++ /dev/null
@@ -1,34 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=math.o
-
-math.a: $(FILES)
-	-rm -f math.a
-	ar cq math.a $(FILES)
-	-@RANLIB@ math.a
-	echo >linker_options @LIBS@
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/math/configure.in b/src/modules/math/configure.in
index caa04e6aab996feecce7c284d2e5b3dedc45b708..bcd847a2787a3289e84734ad5806b09ace37cdb4 100644
--- a/src/modules/math/configure.in
+++ b/src/modules/math/configure.in
@@ -10,6 +10,10 @@ if test "${ac_cv_lib_m}" = "no" -a "${pike_cv_sys_os}" = "Linux"; then
 fi
 
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 AC_OUTPUT(Makefile,echo FOO >stamp-h )
 
diff --git a/src/modules/module_dir_marker b/src/modules/module_dir_marker
deleted file mode 100644
index 095cf52524680bcb24200ede16cc788f61401b7e..0000000000000000000000000000000000000000
--- a/src/modules/module_dir_marker
+++ /dev/null
@@ -1 +0,0 @@
-Just ignore this file...
diff --git a/src/modules/sprintf/Makefile.src b/src/modules/module_makefile
similarity index 61%
rename from src/modules/sprintf/Makefile.src
rename to src/modules/module_makefile
index fd7767e1e55cb20912ed388ce3cf6936f57ac378..5365c36aa5dafa9bb5d3bfab8689c95d4502c779 100644
--- a/src/modules/sprintf/Makefile.src
+++ b/src/modules/module_makefile
@@ -1,15 +1,6 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
+PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. -I.
 CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
 
-FILES=sprintf.o
-
-sprintf.a: $(FILES)
-	-rm -f sprintf.a
-	ar cq sprintf.a $(FILES)
-	-@RANLIB@ sprintf.a
-
 clean:
 	-rm -f *.o *.a
 
@@ -28,6 +19,6 @@ verbose_verify: module_testsuite
 
 gdb_verify: module_testsuite
 	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
+	@echo >>.gdbinit run -m $(SRCDIR)/../../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f
 	gdb ../../pike
 	@rm .gdbinit
diff --git a/src/modules/mysql/.cvsignore b/src/modules/mysql/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/mysql/.cvsignore
+++ b/src/modules/mysql/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/mysql/.gitignore b/src/modules/mysql/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/mysql/.gitignore
+++ b/src/modules/mysql/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/mysql/Makefile.src b/src/modules/mysql/Makefile.in
similarity index 88%
rename from src/modules/mysql/Makefile.src
rename to src/modules/mysql/Makefile.in
index 25f66ccd26230584c34c4f906e062c853daeb2ae..8f2955a8ada06faae1a89f2ceb6521fe7c873c72 100644
--- a/src/modules/mysql/Makefile.src
+++ b/src/modules/mysql/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.src,v 1.1 1996/12/28 18:51:39 grubba Exp $
+# $Id: Makefile.in,v 1.1 1997/01/18 21:52:08 hubbe Exp $
 #
 
 SRCDIR=@srcdir@
@@ -30,3 +30,5 @@ clean:
 
 depend:
 	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
+
+@dependencies@
\ No newline at end of file
diff --git a/src/modules/mysql/configure.in b/src/modules/mysql/configure.in
index 02cb6ac76ea30ffb3d887e153d4340dfb919503c..3ec1432a0f8d26004d23ea0ad8c33bfd5b2ecce0 100644
--- a/src/modules/mysql/configure.in
+++ b/src/modules/mysql/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.7 1997/01/11 20:55:12 grubba Exp $
+# $Id: configure.in,v 1.8 1997/01/18 21:52:09 hubbe Exp $
 #
 # Configure script for the mysql-module
 #
@@ -22,6 +22,8 @@ AC_INIT(mysql.c)
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
 
 AC_ARG_WITH(mysql,  [  --without-mysql       no support for the Mysql database],[],[with_mysql=yes])
 
diff --git a/src/modules/pipe/.cvsignore b/src/modules/pipe/.cvsignore
index 64200ddc24cb90d8f410a6a9e2b0b79c4cd30d58..e8c05a6b1368bd1d5a7000db0fd7491d94f8e18d 100644
--- a/src/modules/pipe/.cvsignore
+++ b/src/modules/pipe/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 configure
diff --git a/src/modules/pipe/.gitignore b/src/modules/pipe/.gitignore
index addfc0376f648196d317f7f7299705f23cb23c21..55902085e884bf4ab49e1d9fdd5bdcc740d1f025 100644
--- a/src/modules/pipe/.gitignore
+++ b/src/modules/pipe/.gitignore
@@ -1,2 +1 @@
-/Makefile.in
 /configure
diff --git a/src/modules/pipe/Makefile.in b/src/modules/pipe/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..9184af8ceb3d39be27945004451471d248d18591
--- /dev/null
+++ b/src/modules/pipe/Makefile.in
@@ -0,0 +1,15 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+
+FILES=pipe.o
+
+all: pipe.a
+
+@module_makefile@
+
+pipe.a: $(FILES)
+	-rm -f pipe.a
+	ar cq pipe.a $(FILES)
+	-@RANLIB@ pipe.a
+
+@dependencies@
diff --git a/src/modules/pipe/Makefile.src b/src/modules/pipe/Makefile.src
deleted file mode 100644
index 5b0fc841b36a20e4d6d0c198de05bcb005fed5c5..0000000000000000000000000000000000000000
--- a/src/modules/pipe/Makefile.src
+++ /dev/null
@@ -1,33 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @DEFS@
-
-FILES=pipe.o
-
-pipe.a: $(FILES)
-	-rm -f pipe.a
-	ar cq pipe.a $(FILES)
-	-@RANLIB@ pipe.a
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/pipe/configure.in b/src/modules/pipe/configure.in
index 79fd885d7aa986b6f8bb8a4127873ed71fb581bb..562bd68415e1547c619f67281d361d52c7ee47df 100644
--- a/src/modules/pipe/configure.in
+++ b/src/modules/pipe/configure.in
@@ -5,6 +5,12 @@ AC_PROG_RANLIB
 
 AC_SUBST(RANLIB)
 
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
+
 AC_HAVE_HEADERS(sys/mman.h linux/mman.h)
 AC_HAVE_FUNCS(mmap munmap)
 
diff --git a/src/modules/pipe/dependencies b/src/modules/pipe/dependencies
deleted file mode 100644
index a8ac43a0e00d979f35ef477e7d78defd56209dbe..0000000000000000000000000000000000000000
--- a/src/modules/pipe/dependencies
+++ /dev/null
@@ -1,16 +0,0 @@
-pipe.o: /home/hubbe/pike/src/modules/pipe/pipe.c \
- /home/hubbe/pike/src/modules/pipe/config.h machine.h \
- /home/hubbe/pike/src/modules/pipe/global.h \
- /home/hubbe/pike/src/modules/pipe/config.h \
- /home/hubbe/pike/src/modules/pipe/port.h \
- /home/hubbe/pike/src/modules/pipe/stralloc.h \
- /home/hubbe/pike/src/modules/pipe/macros.h \
- /home/hubbe/pike/src/modules/pipe/object.h \
- /home/hubbe/pike/src/modules/pipe/svalue.h \
- /home/hubbe/pike/src/modules/pipe/constants.h \
- /home/hubbe/pike/src/modules/pipe/hashtable.h \
- /home/hubbe/pike/src/modules/pipe/las.h \
- /home/hubbe/pike/src/modules/pipe/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/pipe/program.h \
- /home/hubbe/pike/src/modules/pipe/interpret.h \
- /home/hubbe/pike/src/modules/pipe/error.h
diff --git a/src/modules/readlinemod/.cvsignore b/src/modules/readlinemod/.cvsignore
index 64200ddc24cb90d8f410a6a9e2b0b79c4cd30d58..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/readlinemod/.cvsignore
+++ b/src/modules/readlinemod/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 configure
+dependencies
diff --git a/src/modules/readlinemod/.gitignore b/src/modules/readlinemod/.gitignore
index addfc0376f648196d317f7f7299705f23cb23c21..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/readlinemod/.gitignore
+++ b/src/modules/readlinemod/.gitignore
@@ -1,2 +1,2 @@
-/Makefile.in
 /configure
+/dependencies
diff --git a/src/modules/readlinemod/Makefile.src b/src/modules/readlinemod/Makefile.in
similarity index 98%
rename from src/modules/readlinemod/Makefile.src
rename to src/modules/readlinemod/Makefile.in
index 6475118da53b0af8a42a607ac9e56ebfcb04474e..c3def860f319249ab23d1082b6090cb1c2360aa6 100644
--- a/src/modules/readlinemod/Makefile.src
+++ b/src/modules/readlinemod/Makefile.in
@@ -33,3 +33,5 @@ gdb_verify: module_testsuite
 	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
 	gdb ../../pike
 	@rm .gdbinit
+
+@dependencies@
diff --git a/src/modules/readlinemod/configure.in b/src/modules/readlinemod/configure.in
index 573e2715c35d4d0b60156af59de716ab0042da29..2c6dcf2e591abb49bac59282b113502a072a1e89 100644
--- a/src/modules/readlinemod/configure.in
+++ b/src/modules/readlinemod/configure.in
@@ -6,6 +6,9 @@ AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
 
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
 if test x$with_readline = xyes ; then
   AC_MSG_CHECKING(Checking for GNU directory)
 
diff --git a/src/modules/regexp/.cvsignore b/src/modules/regexp/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/regexp/.cvsignore
+++ b/src/modules/regexp/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/regexp/.gitignore b/src/modules/regexp/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/regexp/.gitignore
+++ b/src/modules/regexp/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/regexp/Makefile.src b/src/modules/regexp/Makefile.src
deleted file mode 100644
index 7a19278f2ed2d5e00bd1f614bdab5a1d2597a3eb..0000000000000000000000000000000000000000
--- a/src/modules/regexp/Makefile.src
+++ /dev/null
@@ -1,33 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=regexp.o glue.o
-
-regexp.a: $(FILES)
-	-rm -f regexp.a
-	ar cq regexp.a $(FILES)
-	-@RANLIB@ regexp.a
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/regexp/configure.in b/src/modules/regexp/configure.in
index 86bb8c18433339ec22ebda19543a6c05855e5eaf..657933265f4bb35247b34e89a7ea73a86292b7d9 100644
--- a/src/modules/regexp/configure.in
+++ b/src/modules/regexp/configure.in
@@ -4,6 +4,13 @@ AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
 
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
+
+
 AC_OUTPUT(Makefile,echo FOO >stamp-h )
 
 
diff --git a/src/modules/spider/.cvsignore b/src/modules/spider/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..e8c05a6b1368bd1d5a7000db0fd7491d94f8e18d 100644
--- a/src/modules/spider/.cvsignore
+++ b/src/modules/spider/.cvsignore
@@ -1,2 +1 @@
 configure
-Makefile.in
diff --git a/src/modules/spider/.gitignore b/src/modules/spider/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..55902085e884bf4ab49e1d9fdd5bdcc740d1f025 100644
--- a/src/modules/spider/.gitignore
+++ b/src/modules/spider/.gitignore
@@ -1,2 +1 @@
 /configure
-/Makefile.in
diff --git a/src/modules/spider/Makefile.src b/src/modules/spider/Makefile.src
deleted file mode 100644
index 41548e7ae53646e21ae8a96184a1e9dc7d19d81c..0000000000000000000000000000000000000000
--- a/src/modules/spider/Makefile.src
+++ /dev/null
@@ -1,36 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @DEFS@
-
-FILES=spider.o discdate.o stardate.o sdebug.o tree.o lock.o \
-      sharedmem.o streamed_parser.o encode_decode.o http_parse.o \
-      accesseddb.o dumudp.o
-
-spider.a: $(FILES)
-	-rm -f spider.a
-	ar cq spider.a $(FILES)
-	-@RANLIB@ spider.a
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/spider/configure.in b/src/modules/spider/configure.in
index d34c98d3c43be56b57ee2e2ddf3c72f66c6b5583..188037d8aab2b01b238d528989f8846fd4c19545 100644
--- a/src/modules/spider/configure.in
+++ b/src/modules/spider/configure.in
@@ -29,6 +29,8 @@ if test x$ac_cv_lib_thread_mutex_unlock = xno ;  then
 fi
 
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
 
 
 AC_MSG_CHECKING(for h_addr_list)
diff --git a/src/modules/spider/dependencies b/src/modules/spider/dependencies
deleted file mode 100644
index 160e4ee295d1eea34e33d0a989c2f06575a8c444..0000000000000000000000000000000000000000
--- a/src/modules/spider/dependencies
+++ /dev/null
@@ -1,163 +0,0 @@
-discdate.o: /home/hubbe/pike/src/modules/spider/discdate.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
-encode_decode.o: /home/hubbe/pike/src/modules/spider/encode_decode.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/multiset.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
-http_parse.o: /home/hubbe/pike/src/modules/spider/http_parse.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
-lock.o: /home/hubbe/pike/src/modules/spider/lock.c
-sdebug.o: /home/hubbe/pike/src/modules/spider/sdebug.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
-shared_mem_mapping.o: \
- /home/hubbe/pike/src/modules/spider/shared_mem_mapping.c
-sharedmem.o: /home/hubbe/pike/src/modules/spider/sharedmem.c \
- /home/hubbe/pike/src/modules/spider/sharedmem.h
-spider.o: /home/hubbe/pike/src/modules/spider/spider.c machine.h \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h \
- /home/hubbe/pike/src/modules/spider/lock.h \
- /home/hubbe/pike/src/modules/spider/defs.h \
- /home/hubbe/pike/src/modules/spider/streamed_parser.h
-stardate.o: /home/hubbe/pike/src/modules/spider/stardate.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
-streamed_parser.o: \
- /home/hubbe/pike/src/modules/spider/streamed_parser.c \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h machine.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h \
- /home/hubbe/pike/src/modules/spider/streamed_parser.h
-tree.o: /home/hubbe/pike/src/modules/spider/tree.c machine.h \
- /home/hubbe/pike/src/modules/spider/stralloc.h \
- /home/hubbe/pike/src/modules/spider/types.h \
- /home/hubbe/pike/src/modules/spider/global.h \
- /home/hubbe/pike/src/modules/spider/config.h \
- /home/hubbe/pike/src/modules/spider/port.h \
- /home/hubbe/pike/src/modules/spider/macros.h \
- /home/hubbe/pike/src/modules/spider/object.h \
- /home/hubbe/pike/src/modules/spider/svalue.h \
- /home/hubbe/pike/src/modules/spider/constants.h \
- /home/hubbe/pike/src/modules/spider/hashtable.h \
- /home/hubbe/pike/src/modules/spider/las.h \
- /home/hubbe/pike/src/modules/spider/dynamic_buffer.h \
- /home/hubbe/pike/src/modules/spider/program.h \
- /home/hubbe/pike/src/modules/spider/interpret.h \
- /home/hubbe/pike/src/modules/spider/mapping.h \
- /home/hubbe/pike/src/modules/spider/array.h \
- /home/hubbe/pike/src/modules/spider/builtin_functions.h \
- /home/hubbe/pike/src/modules/spider/callback.h
diff --git a/src/modules/sprintf/.cvsignore b/src/modules/sprintf/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/sprintf/.cvsignore
+++ b/src/modules/sprintf/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/sprintf/.gitignore b/src/modules/sprintf/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/sprintf/.gitignore
+++ b/src/modules/sprintf/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/sprintf/configure.in b/src/modules/sprintf/configure.in
index 9d66fd1d46c8fe3fb5683830e46dff751da639c2..f85c2e17cc66301445eba2f9009956dcf41c7957 100644
--- a/src/modules/sprintf/configure.in
+++ b/src/modules/sprintf/configure.in
@@ -4,6 +4,13 @@ AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
 
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
+
+
 AC_OUTPUT(Makefile,echo FOO >stamp-h )
 
 
diff --git a/src/modules/ssleay/.cvsignore b/src/modules/ssleay/.cvsignore
index 76e8a85506890a9ad4125ab962e5b80341ffecdc..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/ssleay/.cvsignore
+++ b/src/modules/ssleay/.cvsignore
@@ -1,2 +1,2 @@
 configure
-Makefile.in
+dependencies
diff --git a/src/modules/ssleay/.gitignore b/src/modules/ssleay/.gitignore
index 1f3e111bcb9a733de582cbc47266cc26dd1ec797..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/ssleay/.gitignore
+++ b/src/modules/ssleay/.gitignore
@@ -1,2 +1,2 @@
 /configure
-/Makefile.in
+/dependencies
diff --git a/src/modules/ssleay/Makefile.src b/src/modules/ssleay/Makefile.src
deleted file mode 100644
index 36d9015c289fd2c9c1a3cdc58da28442906d6035..0000000000000000000000000000000000000000
--- a/src/modules/ssleay/Makefile.src
+++ /dev/null
@@ -1,27 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) @DEFS@ -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../.. @CPPFLAGS@
-
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-OBJS=ssleay.o
-
-ssleay.a: $(OBJS)
-	-rm -f ssleay.a
-	ar cq ssleay.a $(OBJS)
-	-@RANLIB@ ssleay.a
-	echo >linker_options "@LDFLAGS@ @LIBS@"
-
-linker_options: Makefile
-	echo >linker_options "@LDFLAGS@ @LIBS@"
-
-verify:
-	@echo No tests for the ssleay-module.
-
-verbose_verify: verify
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
diff --git a/src/modules/ssleay/configure.in b/src/modules/ssleay/configure.in
index c8b65733fadeb6f7fd4b47cbd5fee29027153e7f..c9db0cefb608b1566c47f740e10bf5e927f41364 100644
--- a/src/modules/ssleay/configure.in
+++ b/src/modules/ssleay/configure.in
@@ -3,6 +3,9 @@ AC_INIT(ssleay.c)
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
 
 AC_ARG_WITH(ssleay,  [  --without-ssleay       no support for the secure socket protocol],[],[with_ssleay=yes])
 
diff --git a/src/modules/zlibmod/.cvsignore b/src/modules/zlibmod/.cvsignore
index 64200ddc24cb90d8f410a6a9e2b0b79c4cd30d58..a8a3cefd4aae69bffc8d30dca48cfa7c34efce0b 100644
--- a/src/modules/zlibmod/.cvsignore
+++ b/src/modules/zlibmod/.cvsignore
@@ -1,2 +1,2 @@
-Makefile.in
 configure
+dependencies
diff --git a/src/modules/zlibmod/.gitignore b/src/modules/zlibmod/.gitignore
index addfc0376f648196d317f7f7299705f23cb23c21..8e0a10a2de5230915002b7168ae3378a4dc7b8a9 100644
--- a/src/modules/zlibmod/.gitignore
+++ b/src/modules/zlibmod/.gitignore
@@ -1,2 +1,2 @@
-/Makefile.in
 /configure
+/dependencies
diff --git a/src/modules/zlibmod/Makefile.src b/src/modules/zlibmod/Makefile.src
deleted file mode 100644
index e7ea5fea70fa238e767416f6389a057ee7f72f8e..0000000000000000000000000000000000000000
--- a/src/modules/zlibmod/Makefile.src
+++ /dev/null
@@ -1,35 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=$(DEFINES) -I. -I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS)
-
-FILES=zlibmod.o
-LIB=zlibmod.a
-
-$(LIB): $(FILES)
-	-rm -f $(LIB)
-	ar cq $(LIB) $(FILES)
-	-@RANLIB@ $(LIB)
-	echo >linker_options @LIBS@
-
-clean:
-	-rm -f *.o *.a
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR)
-
-#verify / debug
-module_testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >module_testsuite
-
-verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite
-
-verbose_verify: module_testsuite
-	$(RUNPIKE) $(TMP_BINDIR)/test_pike.pike module_testsuite --verbose
-
-gdb_verify: module_testsuite
-	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -m @srcdir@/../../../lib/master.pike $(PIKEOPTS) @srcdir@/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
-	@rm .gdbinit
diff --git a/src/modules/zlibmod/configure.in b/src/modules/zlibmod/configure.in
index 04c676995366b13a67d5c080cbd2ba37d3c1dea5..d0c2063019511f1f934a5eeb54e49beb58b9f37a 100644
--- a/src/modules/zlibmod/configure.in
+++ b/src/modules/zlibmod/configure.in
@@ -5,6 +5,11 @@ AC_ARG_WITH(zlib,     [  --with(out)-zlib       Support gzip compression],[],[wi
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
+AC_SUBST_FILE(module_makefile)
+module_makefile=$srcdir/../module_makefile
 
 if test x$with_zlib = xyes ; then
   AC_CHECK_HEADERS(zlib.h)
diff --git a/src/object.h b/src/object.h
index ad712df3ddf6039691b90534f446ed52d6705ae9..9ee168ad26f1676f7c52566ba260bdd58386c0de 100644
--- a/src/object.h
+++ b/src/object.h
@@ -26,6 +26,8 @@ struct object
 extern struct object fake_object;
 extern struct object *first_object;
 extern struct object *objects_to_destruct;
+extern struct object *master_object;
+extern struct program *master_program;
 
 #define free_object(O) do{ struct object *o_=(O); if(!--o_->refs) really_free_object(o_); }while(0)
 
@@ -46,16 +48,16 @@ void really_free_object(struct object *o);
 void low_object_index_no_free(struct svalue *to,
 			      struct object *o,
 			      INT32 f);
-void object_index_no_free(struct svalue *to,
+void object_index_no_free2(struct svalue *to,
 			  struct object *o,
 			  struct svalue *index);
-void object_index_no_free2(struct svalue *to,
+void object_index_no_free(struct svalue *to,
 			   struct object *o,
 			   struct svalue *index);
-void object_set_index(struct object *o,
+void object_set_index2(struct object *o,
 		      struct svalue *index,
 		      struct svalue *from);
-void object_set_index2(struct object *o,
+void object_set_index(struct object *o,
 		       struct svalue *index,
 		       struct svalue *from);
 union anything *object_get_item_ptr(struct object *o,
diff --git a/src/run_autoconfig b/src/run_autoconfig
index 86b26aa2bc2250c387ddcbb7805893ab45a6614e..af9bdcbfb17629591b1e0e889b349be585c4f8b5 100755
--- a/src/run_autoconfig
+++ b/src/run_autoconfig
@@ -8,16 +8,8 @@ fix()
     ( cd $1 ; autoconf )
   fi
 
-  if [ ! -f $1/Makefile.in ]; then
-    cp $1/Makefile.src $1/Makefile.in
-  elif [ -f $1/Makefile.src ]; then
-    if cmp $1/Makefile.src $1/Makefile.in >/dev/null; then
-      :
-    else
-      # This might not be strictly necessary, but you
-      # need to run 'make depend' afterwards anyway.
-      cp $1/Makefile.src $1/Makefile.in
-    fi
+  if [ ! -f $1/dependencies ]; then
+    echo >$1/dependencies
   fi
 }