From 6265aa306d74dd115e0406328ade53e39a2021a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sat, 18 Jan 1997 13:55:47 -0800
Subject: [PATCH] All Makefile.src now removed, Makefile.in added instead, .
cvsignore and configure.in files updated
Rev: src/.cvsignore:1.3
Rev: src/Makefile.in:1.3
Rev: src/Makefile.src:1.19(DEAD)
Rev: src/configure.in:1.42
Rev: src/modules/.cvsignore:1.2
Rev: src/modules/Makefile.in:1.3
Rev: src/modules/Makefile.src:1.11(DEAD)
Rev: src/modules/call_out/.cvsignore:1.2
Rev: src/modules/call_out/Makefile.in:1.3
Rev: src/modules/call_out/Makefile.src:1.5(DEAD)
Rev: src/modules/call_out/configure.in:1.2
Rev: src/modules/configure.in:1.2
Rev: src/modules/files/.cvsignore:1.2
Rev: src/modules/files/Makefile.in:1.3
Rev: src/modules/files/Makefile.src:1.6(DEAD)
Rev: src/modules/files/configure.in:1.9
Rev: src/modules/gdbmmod/.cvsignore:1.2
Rev: src/modules/gdbmmod/Makefile.in:1.3
Rev: src/modules/gdbmmod/Makefile.src:1.5(DEAD)
Rev: src/modules/gdbmmod/configure.in:1.3
Rev: src/modules/gmpmod/.cvsignore:1.2
Rev: src/modules/gmpmod/Makefile.in:1.3
Rev: src/modules/gmpmod/Makefile.src:1.5(DEAD)
Rev: src/modules/gmpmod/configure.in:1.4
Rev: src/modules/image/.cvsignore:1.2
Rev: src/modules/image/Makefile.in:1.5
Rev: src/modules/image/Makefile.src:1.11(DEAD)
Rev: src/modules/image/configure.in:1.5
Rev: src/modules/image/dependencies:1.2(DEAD)
Rev: src/modules/math/.cvsignore:1.2
Rev: src/modules/math/Makefile.in:1.3
Rev: src/modules/math/Makefile.src:1.6(DEAD)
Rev: src/modules/math/configure.in:1.2
Rev: src/modules/module_dir_marker:1.2(DEAD)
Rev: src/modules/module_makefile:1.1
Rev: src/modules/mysql/.cvsignore:1.2
Rev: src/modules/mysql/Makefile.in:1.1
Rev: src/modules/mysql/Makefile.src:1.2(DEAD)
Rev: src/modules/mysql/configure.in:1.8
Rev: src/modules/pipe/.cvsignore:1.2
Rev: src/modules/pipe/Makefile.in:1.5
Rev: src/modules/pipe/Makefile.src:1.5(DEAD)
Rev: src/modules/pipe/configure.in:1.2
Rev: src/modules/pipe/dependencies:1.2(DEAD)
Rev: src/modules/readlinemod/.cvsignore:1.2
Rev: src/modules/readlinemod/Makefile.in:1.3
Rev: src/modules/readlinemod/Makefile.src:1.6(DEAD)
Rev: src/modules/readlinemod/configure.in:1.7
Rev: src/modules/regexp/.cvsignore:1.2
Rev: src/modules/regexp/Makefile.src:1.5(DEAD)
Rev: src/modules/regexp/configure.in:1.2
Rev: src/modules/spider/.cvsignore:1.2
Rev: src/modules/spider/Makefile.src:1.7(DEAD)
Rev: src/modules/spider/configure.in:1.8
Rev: src/modules/spider/dependencies:1.2(DEAD)
Rev: src/modules/sprintf/.cvsignore:1.2
Rev: src/modules/sprintf/Makefile.src:1.5(DEAD)
Rev: src/modules/sprintf/configure.in:1.2
Rev: src/modules/ssleay/.cvsignore:1.2
Rev: src/modules/ssleay/Makefile.src:1.8(DEAD)
Rev: src/modules/ssleay/configure.in:1.7
Rev: src/modules/zlibmod/.cvsignore:1.2
Rev: src/modules/zlibmod/Makefile.src:1.2(DEAD)
Rev: src/modules/zlibmod/configure.in:1.2
Rev: src/object.h:1.6
Rev: src/run_autoconfig:1.5
---
.gitattributes | 2 +-
src/.cvsignore | 2 +-
src/.gitignore | 2 +-
src/{Makefile.src => Makefile.in} | 8 +-
src/configure.in | 5 +-
src/modules/.cvsignore | 2 +-
src/modules/.gitignore | 2 +-
src/modules/{Makefile.src => Makefile.in} | 2 +
src/modules/call_out/.cvsignore | 2 +-
src/modules/call_out/.gitignore | 2 +-
src/modules/call_out/Makefile.in | 14 ++
src/modules/call_out/Makefile.src | 33 ----
src/modules/call_out/configure.in | 4 +
src/modules/configure.in | 4 +-
src/modules/files/.cvsignore | 2 +-
src/modules/files/.gitignore | 2 +-
src/modules/files/Makefile.in | 15 ++
src/modules/files/Makefile.src | 39 -----
src/modules/files/configure.in | 4 +
src/modules/gdbmmod/.cvsignore | 5 +-
src/modules/gdbmmod/.gitignore | 5 +-
src/modules/gdbmmod/Makefile.in | 17 ++
src/modules/gdbmmod/Makefile.src | 35 ----
src/modules/gdbmmod/configure.in | 4 +
src/modules/gmpmod/.cvsignore | 2 +-
src/modules/gmpmod/.gitignore | 2 +-
src/modules/gmpmod/Makefile.in | 17 ++
src/modules/gmpmod/Makefile.src | 35 ----
src/modules/gmpmod/configure.in | 4 +
src/modules/image/.cvsignore | 1 -
src/modules/image/.gitignore | 1 -
src/modules/image/Makefile.in | 23 +++
src/modules/image/Makefile.src | 41 -----
src/modules/image/configure.in | 4 +
src/modules/image/dependencies | 53 ------
src/modules/math/.cvsignore | 2 +-
src/modules/math/.gitignore | 2 +-
src/modules/math/Makefile.in | 16 ++
src/modules/math/Makefile.src | 34 ----
src/modules/math/configure.in | 4 +
src/modules/module_dir_marker | 1 -
.../{sprintf/Makefile.src => module_makefile} | 13 +-
src/modules/mysql/.cvsignore | 2 +-
src/modules/mysql/.gitignore | 2 +-
.../mysql/{Makefile.src => Makefile.in} | 4 +-
src/modules/mysql/configure.in | 4 +-
src/modules/pipe/.cvsignore | 1 -
src/modules/pipe/.gitignore | 1 -
src/modules/pipe/Makefile.in | 15 ++
src/modules/pipe/Makefile.src | 33 ----
src/modules/pipe/configure.in | 6 +
src/modules/pipe/dependencies | 16 --
src/modules/readlinemod/.cvsignore | 2 +-
src/modules/readlinemod/.gitignore | 2 +-
.../readlinemod/{Makefile.src => Makefile.in} | 2 +
src/modules/readlinemod/configure.in | 3 +
src/modules/regexp/.cvsignore | 2 +-
src/modules/regexp/.gitignore | 2 +-
src/modules/regexp/Makefile.src | 33 ----
src/modules/regexp/configure.in | 7 +
src/modules/spider/.cvsignore | 1 -
src/modules/spider/.gitignore | 1 -
src/modules/spider/Makefile.src | 36 ----
src/modules/spider/configure.in | 2 +
src/modules/spider/dependencies | 163 ------------------
src/modules/sprintf/.cvsignore | 2 +-
src/modules/sprintf/.gitignore | 2 +-
src/modules/sprintf/configure.in | 7 +
src/modules/ssleay/.cvsignore | 2 +-
src/modules/ssleay/.gitignore | 2 +-
src/modules/ssleay/Makefile.src | 27 ---
src/modules/ssleay/configure.in | 3 +
src/modules/zlibmod/.cvsignore | 2 +-
src/modules/zlibmod/.gitignore | 2 +-
src/modules/zlibmod/Makefile.src | 35 ----
src/modules/zlibmod/configure.in | 5 +
src/object.h | 10 +-
src/run_autoconfig | 12 +-
78 files changed, 233 insertions(+), 685 deletions(-)
rename src/{Makefile.src => Makefile.in} (97%)
rename src/modules/{Makefile.src => Makefile.in} (98%)
create mode 100644 src/modules/call_out/Makefile.in
delete mode 100644 src/modules/call_out/Makefile.src
create mode 100644 src/modules/files/Makefile.in
delete mode 100644 src/modules/files/Makefile.src
create mode 100644 src/modules/gdbmmod/Makefile.in
delete mode 100644 src/modules/gdbmmod/Makefile.src
create mode 100644 src/modules/gmpmod/Makefile.in
delete mode 100644 src/modules/gmpmod/Makefile.src
create mode 100644 src/modules/image/Makefile.in
delete mode 100644 src/modules/image/Makefile.src
delete mode 100644 src/modules/image/dependencies
create mode 100644 src/modules/math/Makefile.in
delete mode 100644 src/modules/math/Makefile.src
delete mode 100644 src/modules/module_dir_marker
rename src/modules/{sprintf/Makefile.src => module_makefile} (61%)
rename src/modules/mysql/{Makefile.src => Makefile.in} (88%)
create mode 100644 src/modules/pipe/Makefile.in
delete mode 100644 src/modules/pipe/Makefile.src
delete mode 100644 src/modules/pipe/dependencies
rename src/modules/readlinemod/{Makefile.src => Makefile.in} (98%)
delete mode 100644 src/modules/regexp/Makefile.src
delete mode 100644 src/modules/spider/Makefile.src
delete mode 100644 src/modules/spider/dependencies
delete mode 100644 src/modules/ssleay/Makefile.src
delete mode 100644 src/modules/zlibmod/Makefile.src
diff --git a/.gitattributes b/.gitattributes
index 96aed6ceb2..c6e909023e 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 ddb2fab11e..fd68b3e776 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 ad6f768107..bf7dde9fe2 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 5a3c3cf75f..d853da01a7 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 bc811e5f8e..377e695e44 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 64200ddc24..a8a3cefd4a 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 addfc0376f..8e0a10a2de 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 308aab3523..54708a8b23 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 0000000000..588de186c7
--- /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 7d64103705..0000000000
--- 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 ae228dce80..a6e609d9dd 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 9c8f79d139..e8ded21a05 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 0000000000..e654c89368
--- /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 be092b44fe..0000000000
--- 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 7d095469c4..d3d96f6fb4 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 95cf939d53..e54890b35b 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 3e601eb607..fa8ffddc0e 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 0000000000..83310b82bc
--- /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 bf59f23126..0000000000
--- 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 9daaf33ff3..6619e71f5e 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 64200ddc24..a8a3cefd4a 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 addfc0376f..8e0a10a2de 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 0000000000..7f875d752c
--- /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 4ec8783f51..0000000000
--- 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 bff2645771..d68e301ed2 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 76e8a85506..e8c05a6b13 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 1f3e111bcb..55902085e8 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 0000000000..389cb503ab
--- /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 cfb2140ca2..0000000000
--- 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 36b2dd8b64..ad476e41ff 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 d6a94c7519..0000000000
--- 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 0000000000..669fb7a76a
--- /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 6a15780545..0000000000
--- 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 caa04e6aab..bcd847a278 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 095cf52524..0000000000
--- 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 fd7767e1e5..5365c36aa5 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 25f66ccd26..8f2955a8ad 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 02cb6ac76e..3ec1432a0f 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 64200ddc24..e8c05a6b13 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 addfc0376f..55902085e8 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 0000000000..9184af8ceb
--- /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 5b0fc841b3..0000000000
--- 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 79fd885d7a..562bd68415 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 a8ac43a0e0..0000000000
--- 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 64200ddc24..a8a3cefd4a 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 addfc0376f..8e0a10a2de 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 6475118da5..c3def860f3 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 573e2715c3..2c6dcf2e59 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 7a19278f2e..0000000000
--- 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 86bb8c1843..657933265f 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 76e8a85506..e8c05a6b13 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 1f3e111bcb..55902085e8 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 41548e7ae5..0000000000
--- 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 d34c98d3c4..188037d8aa 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 160e4ee295..0000000000
--- 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 9d66fd1d46..f85c2e17cc 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 76e8a85506..a8a3cefd4a 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 1f3e111bcb..8e0a10a2de 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 36d9015c28..0000000000
--- 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 c8b65733fa..c9db0cefb6 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 64200ddc24..a8a3cefd4a 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 addfc0376f..8e0a10a2de 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 e7ea5fea70..0000000000
--- 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 04c6769953..d0c2063019 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 ad712df3dd..9ee168ad26 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 86b26aa2bc..af9bdcbfb1 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
}
--
GitLab