From b11182b7c21a24f54de36b9764e20b773fd59b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Thu, 18 Nov 1999 00:04:01 -0800 Subject: [PATCH] changed MAKE_FLAG handling Rev: src/.cvsignore:1.20 Rev: src/Makefile.in:1.167 Rev: src/aclocal.m4:1.16 Rev: src/configure.in:1.331 Rev: src/make_variables.in:1.1 Rev: src/modules/.cvsignore:1.6 Rev: src/modules/CommonLog/.cvsignore:1.3 Rev: src/modules/CommonLog/Makefile.in:1.2 Rev: src/modules/Gdbm/.cvsignore:1.4 Rev: src/modules/Gdbm/Makefile.in:1.5 Rev: src/modules/Gmp/.cvsignore:1.3 Rev: src/modules/Gmp/Makefile.in:1.11 Rev: src/modules/Gz/.cvsignore:1.4 Rev: src/modules/Gz/Makefile.in:1.5 Rev: src/modules/HTTPLoop/.cvsignore:1.3 Rev: src/modules/HTTPLoop/Makefile.in:1.2 Rev: src/modules/HTTPLoop/configure.in:1.2 Rev: src/modules/Image/.cvsignore:1.6 Rev: src/modules/Image/Makefile.in:1.31 Rev: src/modules/Image/encodings/.cvsignore:1.2 Rev: src/modules/Java/.cvsignore:1.2 Rev: src/modules/Java/Makefile.in:1.4 Rev: src/modules/MIME/.cvsignore:1.3 Rev: src/modules/MIME/Makefile.in:1.4 Rev: src/modules/Makefile.in:1.33 Rev: src/modules/Math/.cvsignore:1.2 Rev: src/modules/Math/Makefile.in:1.4 Rev: src/modules/Msql/.cvsignore:1.3 Rev: src/modules/Msql/Makefile.in:1.5 Rev: src/modules/Mysql/.cvsignore:1.4 Rev: src/modules/Mysql/Makefile.in:1.5 Rev: src/modules/Odbc/.cvsignore:1.3 Rev: src/modules/Odbc/Makefile.in:1.4 Rev: src/modules/Oracle/.cvsignore:1.3 Rev: src/modules/Oracle/Makefile.in:1.3 Rev: src/modules/Parser/.cvsignore:1.2 Rev: src/modules/Parser/Makefile.in:1.3 Rev: src/modules/Perl/.cvsignore:1.4 Rev: src/modules/Perl/Makefile.in:1.4 Rev: src/modules/Pipe/.cvsignore:1.4 Rev: src/modules/Pipe/Makefile.in:1.5 Rev: src/modules/Postgres/.cvsignore:1.3 Rev: src/modules/Postgres/Makefile.in:1.5 Rev: src/modules/Regexp/.cvsignore:1.4 Rev: src/modules/Regexp/Makefile.in:1.7 Rev: src/modules/Ssleay/.cvsignore:1.4 Rev: src/modules/Ssleay/Makefile.in:1.5 Rev: src/modules/Yp/.cvsignore:1.3 Rev: src/modules/Yp/Makefile.in:1.5 Rev: src/modules/_Charset/.cvsignore:1.2 Rev: src/modules/_Charset/Makefile.in:1.4 Rev: src/modules/_Crypto/.cvsignore:1.5 Rev: src/modules/_Crypto/Makefile.in:1.19 Rev: src/modules/_Crypto/lib/.cvsignore:1.3 Rev: src/modules/_Image_JPEG/.cvsignore:1.3 Rev: src/modules/_Image_JPEG/Makefile.in:1.4 Rev: src/modules/_Image_TIFF/.cvsignore:1.2 Rev: src/modules/_Image_TIFF/Makefile.in:1.3 Rev: src/modules/_Image_TTF/.cvsignore:1.4 Rev: src/modules/_Image_TTF/Makefile.in:1.3 Rev: src/modules/_Image_XFace/.cvsignore:1.2 Rev: src/modules/_Image_XFace/Makefile.in:1.4 Rev: src/modules/_math/.cvsignore:1.8 Rev: src/modules/_math/Makefile.in:1.7 Rev: src/modules/call_out/.cvsignore:1.8 Rev: src/modules/call_out/Makefile.in:1.8 Rev: src/modules/files/.cvsignore:1.7 Rev: src/modules/files/Makefile.in:1.11 Rev: src/modules/spider/.cvsignore:1.10 Rev: src/modules/spider/Makefile.in:1.19 Rev: src/modules/sprintf/.cvsignore:1.8 Rev: src/modules/sprintf/Makefile.in:1.8 Rev: src/modules/system/.cvsignore:1.9 Rev: src/modules/system/Makefile.in:1.9 Rev: src/post_modules/.cvsignore:1.2 Rev: src/post_modules/GL/.cvsignore:1.2 Rev: src/post_modules/GL/Makefile.in:1.6 Rev: src/post_modules/GLUT/.cvsignore:1.2 Rev: src/post_modules/GLUT/Makefile.in:1.3 Rev: src/post_modules/GTK/.cvsignore:1.4 Rev: src/post_modules/GTK/Makefile.in:1.5 Rev: src/post_modules/Makefile.in:1.2 --- src/.cvsignore | 2 + src/.gitignore | 2 + src/Makefile.in | 5 +- src/aclocal.m4 | 79 +++++++++++++++++++++++++- src/configure.in | 14 +---- src/make_variables.in | 16 ++++++ src/modules/.cvsignore | 1 + src/modules/.gitignore | 1 + src/modules/CommonLog/.cvsignore | 1 + src/modules/CommonLog/.gitignore | 1 + src/modules/CommonLog/Makefile.in | 4 +- src/modules/Gdbm/.cvsignore | 1 + src/modules/Gdbm/.gitignore | 1 + src/modules/Gdbm/Makefile.in | 4 +- src/modules/Gmp/.cvsignore | 1 + src/modules/Gmp/.gitignore | 1 + src/modules/Gmp/Makefile.in | 4 +- src/modules/Gz/.cvsignore | 1 + src/modules/Gz/.gitignore | 1 + src/modules/Gz/Makefile.in | 4 +- src/modules/HTTPLoop/.cvsignore | 1 + src/modules/HTTPLoop/.gitignore | 1 + src/modules/HTTPLoop/Makefile.in | 4 +- src/modules/HTTPLoop/configure.in | 4 +- src/modules/Image/.cvsignore | 1 + src/modules/Image/.gitignore | 1 + src/modules/Image/Makefile.in | 4 +- src/modules/Image/encodings/.cvsignore | 1 + src/modules/Image/encodings/.gitignore | 1 + src/modules/Java/.cvsignore | 1 + src/modules/Java/.gitignore | 1 + src/modules/Java/Makefile.in | 4 +- src/modules/MIME/.cvsignore | 1 + src/modules/MIME/.gitignore | 1 + src/modules/MIME/Makefile.in | 4 +- src/modules/Makefile.in | 9 +-- src/modules/Math/.cvsignore | 1 + src/modules/Math/.gitignore | 1 + src/modules/Math/Makefile.in | 4 +- src/modules/Msql/.cvsignore | 1 + src/modules/Msql/.gitignore | 1 + src/modules/Msql/Makefile.in | 4 +- src/modules/Mysql/.cvsignore | 1 + src/modules/Mysql/.gitignore | 1 + src/modules/Mysql/Makefile.in | 4 +- src/modules/Odbc/.cvsignore | 1 + src/modules/Odbc/.gitignore | 1 + src/modules/Odbc/Makefile.in | 4 +- src/modules/Oracle/.cvsignore | 1 + src/modules/Oracle/.gitignore | 1 + src/modules/Oracle/Makefile.in | 4 +- src/modules/Parser/.cvsignore | 1 + src/modules/Parser/.gitignore | 1 + src/modules/Parser/Makefile.in | 4 +- src/modules/Perl/.cvsignore | 1 + src/modules/Perl/.gitignore | 1 + src/modules/Perl/Makefile.in | 4 +- src/modules/Pipe/.cvsignore | 1 + src/modules/Pipe/.gitignore | 1 + src/modules/Pipe/Makefile.in | 4 +- src/modules/Postgres/.cvsignore | 1 + src/modules/Postgres/.gitignore | 1 + src/modules/Postgres/Makefile.in | 4 +- src/modules/Regexp/.cvsignore | 1 + src/modules/Regexp/.gitignore | 1 + src/modules/Regexp/Makefile.in | 4 +- src/modules/Ssleay/.cvsignore | 1 + src/modules/Ssleay/.gitignore | 1 + src/modules/Ssleay/Makefile.in | 4 +- src/modules/Yp/.cvsignore | 1 + src/modules/Yp/.gitignore | 1 + src/modules/Yp/Makefile.in | 4 +- src/modules/_Charset/.cvsignore | 1 + src/modules/_Charset/.gitignore | 1 + src/modules/_Charset/Makefile.in | 4 +- src/modules/_Crypto/.cvsignore | 1 + src/modules/_Crypto/.gitignore | 1 + src/modules/_Crypto/Makefile.in | 4 +- src/modules/_Crypto/lib/.cvsignore | 1 + src/modules/_Crypto/lib/.gitignore | 1 + src/modules/_Image_JPEG/.cvsignore | 5 +- src/modules/_Image_JPEG/.gitignore | 5 +- src/modules/_Image_JPEG/Makefile.in | 4 +- src/modules/_Image_TIFF/.cvsignore | 5 +- src/modules/_Image_TIFF/.gitignore | 5 +- src/modules/_Image_TIFF/Makefile.in | 4 +- src/modules/_Image_TTF/.cvsignore | 1 + src/modules/_Image_TTF/.gitignore | 1 + src/modules/_Image_TTF/Makefile.in | 4 +- src/modules/_Image_XFace/.cvsignore | 5 +- src/modules/_Image_XFace/.gitignore | 5 +- src/modules/_Image_XFace/Makefile.in | 4 +- src/modules/_math/.cvsignore | 1 + src/modules/_math/.gitignore | 1 + src/modules/_math/Makefile.in | 4 +- src/modules/call_out/.cvsignore | 1 + src/modules/call_out/.gitignore | 1 + src/modules/call_out/Makefile.in | 4 +- src/modules/files/.cvsignore | 1 + src/modules/files/.gitignore | 1 + src/modules/files/Makefile.in | 4 +- src/modules/spider/.cvsignore | 1 + src/modules/spider/.gitignore | 1 + src/modules/spider/Makefile.in | 4 +- src/modules/sprintf/.cvsignore | 1 + src/modules/sprintf/.gitignore | 1 + src/modules/sprintf/Makefile.in | 4 +- src/modules/system/.cvsignore | 3 +- src/modules/system/.gitignore | 3 +- src/modules/system/Makefile.in | 4 +- src/post_modules/.cvsignore | 1 + src/post_modules/.gitignore | 1 + src/post_modules/GL/.cvsignore | 5 +- src/post_modules/GL/.gitignore | 5 +- src/post_modules/GL/Makefile.in | 4 +- src/post_modules/GLUT/.cvsignore | 5 +- src/post_modules/GLUT/.gitignore | 5 +- src/post_modules/GLUT/Makefile.in | 4 +- src/post_modules/GTK/.cvsignore | 2 + src/post_modules/GTK/.gitignore | 2 + src/post_modules/GTK/Makefile.in | 2 +- src/post_modules/Makefile.in | 11 +--- 122 files changed, 278 insertions(+), 126 deletions(-) create mode 100644 src/make_variables.in diff --git a/src/.cvsignore b/src/.cvsignore index 5a62994171..4e5af5e9a6 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -17,10 +17,12 @@ language.h lib machine.h machine.h.in +make_variables master.pike peep_engine.c pike qsort_template.h +remake smartlink stamp-h stamp-h.in diff --git a/src/.gitignore b/src/.gitignore index 861907702c..6009a04efc 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -17,10 +17,12 @@ /lib /machine.h /machine.h.in +/make_variables /master.pike /peep_engine.c /pike /qsort_template.h +/remake /smartlink /stamp-h /stamp-h.in diff --git a/src/Makefile.in b/src/Makefile.in index cc7a483bb3..fc7199a278 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.166 1999/11/11 17:50:59 grubba Exp $ +# $Id: Makefile.in,v 1.167 1999/11/18 07:58:17 hubbe Exp $ # # This line is needed on some machines. @@ -85,8 +85,7 @@ LDFLAGS=@LDFLAGS@ @LINKFORSHARED@ $(EXTRALDFLAGS) RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) RUNTPIKE=$(TMP_BUILDDIR)/tpike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) -MOST_MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" "NOOPTFLAGS=$(NOOPTFLAGS)" "AR=$(AR)" "CC=$(CC)" "MAKE=$(MAKE)" -MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)" +MAKE_FLAGS= # Add alloca.o if you don't have alloca() on your machine. # diff --git a/src/aclocal.m4 b/src/aclocal.m4 index ad47fe82a0..0fa95a0e4d 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -104,7 +104,7 @@ rm -rf conftest*]) define([AC_LOW_MODULE_INIT], [ -# $Id: aclocal.m4,v 1.15 1999/11/15 21:39:26 grubba Exp $ +# $Id: aclocal.m4,v 1.16 1999/11/18 07:58:19 hubbe Exp $ MY_AC_PROG_CC @@ -117,6 +117,7 @@ dependencies=$srcdir/dependencies AC_SUBST_FILE(dynamic_module_makefile) AC_SUBST_FILE(static_module_makefile) + ]) @@ -150,4 +151,80 @@ static_module_makefile=PIKE_INCLUDE_PATH/dynamic_module_makefile done AC_MSG_RESULT(found) ]) + ]) + +pushdef([AC_OUTPUT], +[ + AC_SET_MAKE + + AC_SUBST(prefix) + export prefix + AC_SUBST(exec_prefix) + export exec_prefix + AC_SUBST(CC) + export CC + AC_SUBST(BINDIR) + export BINDIR + AC_SUBST(BUILDDIR) + export BUILDDIR + AC_SUBST(TMP_LIBDIR) + export TMP_BUILDDIR + AC_SUBST(TMP_BUILDDIR) + export INSTALL + AC_SUBST(INSTALL) + export AR + AC_SUBST(AR) + export CFLAGS + AC_SUBST(CFLAGS) + export CPPFLAGS + AC_SUBST(CPPFLAGS) + export OPTIMIZE + AC_SUBST(OPTIMIZE) + export WARN + AC_SUBST(WARN) + +ifdef([PIKE_INCLUDE_PATH], +[ + make_variables_in=PIKE_INCLUDE_PATH/make_variables_in +],[ + AC_MSG_CHECKING([for the Pike base directory]) + + make_variables_in=make_variables.in + + counter=. + + while test ! -f "$srcdir/$make_variables_in" + do + counter=.$counter + if test $counter = .......... ; then + AC_MSG_RESULT(failed) + exit 1 + else + : + fi + make_variables_in=../$make_variables_in + done + + AC_MSG_RESULT(found) +]) + + AC_SUBST_FILE(make_variables) + make_variables=make_variables + +popdef([AC_OUTPUT]) +AC_OUTPUT(make_variables:$make_variables_in $][1,$][2,$][3) +]) +dnl +dnl +dnl +define(MY_CHECK_FUNCTION,[ +AC_MSG_CHECKING(for working $1) +AC_CACHE_VAL(pike_cv_func_$1,[ +AC_TRY_RUN([$2],pike_cv_func_$1=yes,pike_cv_func_$1=no,pike_cv_func_$1=no) +]) +AC_MSG_RESULT([$]pike_cv_func_$1) +if test [$]pike_cv_func_$1 = yes; then +AC_DEFINE(translit(HAVE_$1,[a-z],[A-Z])) +fi]) + diff --git a/src/configure.in b/src/configure.in index a86d32ff77..2e55f9773f 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1,4 +1,4 @@ -AC_REVISION("$Id: configure.in,v 1.330 1999/11/13 00:33:17 grubba Exp $") +AC_REVISION("$Id: configure.in,v 1.331 1999/11/18 07:58:20 hubbe Exp $") AC_INIT(interpret.c) AC_CONFIG_HEADER(machine.h) @@ -1993,18 +1993,6 @@ pike_cv_hardware_byteorder=0 AC_MSG_RESULT($pike_cv_hardware_byteorder) AC_DEFINE_UNQUOTED(PIKE_BYTEORDER,$pike_cv_hardware_byteorder) -dnl##################################################################### - -define(MY_CHECK_FUNCTION,[ -AC_MSG_CHECKING(for working $1) -AC_CACHE_VAL(pike_cv_func_$1,[ -AC_TRY_RUN([$2],pike_cv_func_$1=yes,pike_cv_func_$1=no,pike_cv_func_$1=no) -]) -AC_MSG_RESULT([$]pike_cv_func_$1) -if test [$]pike_cv_func_$1 = yes; then -AC_DEFINE(translit(HAVE_$1,[a-z],[A-Z])) -fi]) - ######################################################################## MY_CHECK_FUNCTION(fork, [ diff --git a/src/make_variables.in b/src/make_variables.in new file mode 100644 index 0000000000..e87217c6dc --- /dev/null +++ b/src/make_variables.in @@ -0,0 +1,16 @@ +@SET_MAKE@ +prefix=@prefix@ +exec_prefix=$(prefix)/bin +CC=@CC@ +TMP_BUILDDIR=@BUILDDIR@ +TMP_BINDIR=@BINDIR@ +DEFINES=@CPPFLAGS@ +TMP_LIBDIR=$(TMP_BUILDDIR)/lib +RUNPIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) +RUNTPIKE=$(TMP_BUILDDIR)/tpike -DNOT_INSTALLED -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) +OPTIMIZE=@OPTIMIZE@ +INSTALL=@INSTALL@ +OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL) +NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL) +AR=@AR@ +SRCDIR=@srcdir@ diff --git a/src/modules/.cvsignore b/src/modules/.cvsignore index e7dc5c3a55..820115e416 100644 --- a/src/modules/.cvsignore +++ b/src/modules/.cvsignore @@ -7,6 +7,7 @@ dependencies dynamic_module_makefile lib_dirs linker_options +make_variables master_lib_dirs modlist.h modlist_headers.h diff --git a/src/modules/.gitignore b/src/modules/.gitignore index 4fbf7d96ce..9412079f83 100644 --- a/src/modules/.gitignore +++ b/src/modules/.gitignore @@ -7,6 +7,7 @@ /dynamic_module_makefile /lib_dirs /linker_options +/make_variables /master_lib_dirs /modlist.h /modlist_headers.h diff --git a/src/modules/CommonLog/.cvsignore b/src/modules/CommonLog/.cvsignore index 8cdfc5ec0b..fb57b9338a 100644 --- a/src/modules/CommonLog/.cvsignore +++ b/src/modules/CommonLog/.cvsignore @@ -6,6 +6,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/CommonLog/.gitignore b/src/modules/CommonLog/.gitignore index a63f25e58d..229797d1f8 100644 --- a/src/modules/CommonLog/.gitignore +++ b/src/modules/CommonLog/.gitignore @@ -6,6 +6,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/CommonLog/Makefile.in b/src/modules/CommonLog/Makefile.in index f28118a8e9..0b45fc8615 100644 --- a/src/modules/CommonLog/Makefile.in +++ b/src/modules/CommonLog/Makefile.in @@ -1,10 +1,10 @@ # -# $Id: Makefile.in,v 1.1 1999/11/14 00:47:21 per Exp $ +# $Id: Makefile.in,v 1.2 1999/11/18 07:58:37 hubbe Exp $ # # Makefile for CommonLog # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=clf.o diff --git a/src/modules/Gdbm/.cvsignore b/src/modules/Gdbm/.cvsignore index 336777f65a..31bb659802 100644 --- a/src/modules/Gdbm/.cvsignore +++ b/src/modules/Gdbm/.cvsignore @@ -8,6 +8,7 @@ dependencies gdbm_machine.h gdbm_machine.h.in linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Gdbm/.gitignore b/src/modules/Gdbm/.gitignore index fb7e52e8ab..191434fea0 100644 --- a/src/modules/Gdbm/.gitignore +++ b/src/modules/Gdbm/.gitignore @@ -8,6 +8,7 @@ /gdbm_machine.h /gdbm_machine.h.in /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Gdbm/Makefile.in b/src/modules/Gdbm/Makefile.in index 6801f54a1d..eeb4ab97fc 100644 --- a/src/modules/Gdbm/Makefile.in +++ b/src/modules/Gdbm/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:32:56 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 07:58:46 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ OBJS=gdbmmod.o diff --git a/src/modules/Gmp/.cvsignore b/src/modules/Gmp/.cvsignore index f9287fe274..ea0ec0eec9 100644 --- a/src/modules/Gmp/.cvsignore +++ b/src/modules/Gmp/.cvsignore @@ -6,6 +6,7 @@ configure dependencies gmp_machine.h linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Gmp/.gitignore b/src/modules/Gmp/.gitignore index f315ab0790..14c126a2ec 100644 --- a/src/modules/Gmp/.gitignore +++ b/src/modules/Gmp/.gitignore @@ -6,6 +6,7 @@ /dependencies /gmp_machine.h /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Gmp/Makefile.in b/src/modules/Gmp/Makefile.in index 63947e5cbe..5336b65185 100644 --- a/src/modules/Gmp/Makefile.in +++ b/src/modules/Gmp/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.10 1999/11/01 16:53:36 mirar Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.11 1999/11/18 07:58:54 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ OBJS=mpz_glue.o next_prime.o my_mpz_xor.o diff --git a/src/modules/Gz/.cvsignore b/src/modules/Gz/.cvsignore index 74d2b84c04..3e0a5d635c 100644 --- a/src/modules/Gz/.cvsignore +++ b/src/modules/Gz/.cvsignore @@ -5,6 +5,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Gz/.gitignore b/src/modules/Gz/.gitignore index 8858fb05ed..c766141b6f 100644 --- a/src/modules/Gz/.gitignore +++ b/src/modules/Gz/.gitignore @@ -5,6 +5,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Gz/Makefile.in b/src/modules/Gz/Makefile.in index 2a746608f9..78446cf65c 100644 --- a/src/modules/Gz/Makefile.in +++ b/src/modules/Gz/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:33:28 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 07:59:03 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=zlibmod.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/HTTPLoop/.cvsignore b/src/modules/HTTPLoop/.cvsignore index ac7a4afa05..e3d2651bca 100644 --- a/src/modules/HTTPLoop/.cvsignore +++ b/src/modules/HTTPLoop/.cvsignore @@ -6,6 +6,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/HTTPLoop/.gitignore b/src/modules/HTTPLoop/.gitignore index 4e3fcaefb4..d843df545f 100644 --- a/src/modules/HTTPLoop/.gitignore +++ b/src/modules/HTTPLoop/.gitignore @@ -6,6 +6,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/HTTPLoop/Makefile.in b/src/modules/HTTPLoop/Makefile.in index 6837036bc8..8282b354be 100644 --- a/src/modules/HTTPLoop/Makefile.in +++ b/src/modules/HTTPLoop/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.1 1999/11/14 00:43:14 per Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.2 1999/11/18 07:59:12 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=accept_and_parse.o util.o cache.o requestobject.o log.o timeout.o # filesystem.o diff --git a/src/modules/HTTPLoop/configure.in b/src/modules/HTTPLoop/configure.in index 95b47f113e..ae0dcab9fd 100644 --- a/src/modules/HTTPLoop/configure.in +++ b/src/modules/HTTPLoop/configure.in @@ -1,10 +1,10 @@ -# $Id: configure.in,v 1.1 1999/11/14 00:43:14 per Exp $ +# $Id: configure.in,v 1.2 1999/11/18 07:59:13 hubbe Exp $ AC_INIT(accept_and_parse.c) AC_CONFIG_HEADER(config.h) AC_SET_MAKE -sinclude(../module_configure.in) +AC_MODULE_INIT() AC_CHECK_FUNCS(poll gmtime_r gmtime sendfile) diff --git a/src/modules/Image/.cvsignore b/src/modules/Image/.cvsignore index 162d6eaf3e..8f3aaf06dd 100644 --- a/src/modules/Image/.cvsignore +++ b/src/modules/Image/.cvsignore @@ -8,6 +8,7 @@ dependencies image_machine.h image_machine.h.in linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Image/.gitignore b/src/modules/Image/.gitignore index 4e6b9689c8..0f37cb1635 100644 --- a/src/modules/Image/.gitignore +++ b/src/modules/Image/.gitignore @@ -8,6 +8,7 @@ /image_machine.h /image_machine.h.in /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in index e2b7d166d9..280cdc2f1e 100644 --- a/src/modules/Image/Makefile.in +++ b/src/modules/Image/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.30 1999/10/05 05:32:40 hubbe Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.31 1999/11/18 07:59:21 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS = image_module.o \ image.o font.o matrix.o blit.o pattern.o dct.o \ diff --git a/src/modules/Image/encodings/.cvsignore b/src/modules/Image/encodings/.cvsignore index 4daaced033..a2372d7c30 100644 --- a/src/modules/Image/encodings/.cvsignore +++ b/src/modules/Image/encodings/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Image/encodings/.gitignore b/src/modules/Image/encodings/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Image/encodings/.gitignore +++ b/src/modules/Image/encodings/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Java/.cvsignore b/src/modules/Java/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Java/.cvsignore +++ b/src/modules/Java/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Java/.gitignore b/src/modules/Java/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Java/.gitignore +++ b/src/modules/Java/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Java/Makefile.in b/src/modules/Java/Makefile.in index d21e274330..027c9768bd 100644 --- a/src/modules/Java/Makefile.in +++ b/src/modules/Java/Makefile.in @@ -1,8 +1,8 @@ # -# $Id: Makefile.in,v 1.3 1999/04/23 21:34:52 grubba Exp $ +# $Id: Makefile.in,v 1.4 1999/11/18 07:59:37 hubbe Exp $ # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=jvm.o diff --git a/src/modules/MIME/.cvsignore b/src/modules/MIME/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/MIME/.cvsignore +++ b/src/modules/MIME/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/MIME/.gitignore b/src/modules/MIME/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/MIME/.gitignore +++ b/src/modules/MIME/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/MIME/Makefile.in b/src/modules/MIME/Makefile.in index 5f63524f63..46e76e8651 100644 --- a/src/modules/MIME/Makefile.in +++ b/src/modules/MIME/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.3 1999/04/23 21:35:26 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.4 1999/11/18 07:59:46 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=mime.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 1d8392675f..6a0cf3dc3f 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -1,18 +1,13 @@ -# $Id: Makefile.in,v 1.32 1999/10/05 19:48:36 grubba Exp $ +# $Id: Makefile.in,v 1.33 1999/11/18 07:58:29 hubbe Exp $ -@SET_MAKE@ +@make_variables@ -CC=@CC@ CPP=@CPP@ -SRCDIR=@srcdir@ -AR=@AR@ MODULES=@subdirs@ MODULE_SEGMENTS=@MODULE_SEGMENTS@ MODULE_LINKOPTS=@MODULE_LINKOPTS@ -MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)" LDFLAGS="$(LDFLAGS)" "CC=$(CC)" "MAKE=$(MAKE)" "NOOPTFLAGS=$(NOOPTFLAGS)" - all: linker_options modlist.h modlist_headers.h $(MODULE_SEGMENTS) $(MODULE_LINKOPTS): modules diff --git a/src/modules/Math/.cvsignore b/src/modules/Math/.cvsignore index ac7a4afa05..e3d2651bca 100644 --- a/src/modules/Math/.cvsignore +++ b/src/modules/Math/.cvsignore @@ -6,6 +6,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Math/.gitignore b/src/modules/Math/.gitignore index 4e3fcaefb4..d843df545f 100644 --- a/src/modules/Math/.gitignore +++ b/src/modules/Math/.gitignore @@ -6,6 +6,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Math/Makefile.in b/src/modules/Math/Makefile.in index edf831ba85..4d4f2fe2c7 100644 --- a/src/modules/Math/Makefile.in +++ b/src/modules/Math/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.3 1999/04/24 13:15:29 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.4 1999/11/18 07:59:55 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=math_module.o math_matrix.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/Msql/.cvsignore b/src/modules/Msql/.cvsignore index 5cc573c207..85c4c9015d 100644 --- a/src/modules/Msql/.cvsignore +++ b/src/modules/Msql/.cvsignore @@ -4,6 +4,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Msql/.gitignore b/src/modules/Msql/.gitignore index a1f4411e72..76a0ee797a 100644 --- a/src/modules/Msql/.gitignore +++ b/src/modules/Msql/.gitignore @@ -4,6 +4,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Msql/Makefile.in b/src/modules/Msql/Makefile.in index 693d4b87c0..68288e6ed3 100644 --- a/src/modules/Msql/Makefile.in +++ b/src/modules/Msql/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:35:52 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 08:00:04 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=msqlmod.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/Mysql/.cvsignore b/src/modules/Mysql/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Mysql/.cvsignore +++ b/src/modules/Mysql/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Mysql/.gitignore b/src/modules/Mysql/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Mysql/.gitignore +++ b/src/modules/Mysql/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Mysql/Makefile.in b/src/modules/Mysql/Makefile.in index 1b89c1ecc1..81100182c6 100644 --- a/src/modules/Mysql/Makefile.in +++ b/src/modules/Mysql/Makefile.in @@ -1,8 +1,8 @@ # -# $Id: Makefile.in,v 1.4 1999/04/23 21:36:16 grubba Exp $ +# $Id: Makefile.in,v 1.5 1999/11/18 08:00:13 hubbe Exp $ # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=mysql.o result.o diff --git a/src/modules/Odbc/.cvsignore b/src/modules/Odbc/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Odbc/.cvsignore +++ b/src/modules/Odbc/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Odbc/.gitignore b/src/modules/Odbc/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Odbc/.gitignore +++ b/src/modules/Odbc/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Odbc/Makefile.in b/src/modules/Odbc/Makefile.in index c4e7d5ae01..d2408ef5b2 100644 --- a/src/modules/Odbc/Makefile.in +++ b/src/modules/Odbc/Makefile.in @@ -1,8 +1,8 @@ # -# $Id: Makefile.in,v 1.3 1999/04/23 21:36:47 grubba Exp $ +# $Id: Makefile.in,v 1.4 1999/11/18 08:00:22 hubbe Exp $ # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=odbc.o odbc_result.o diff --git a/src/modules/Oracle/.cvsignore b/src/modules/Oracle/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Oracle/.cvsignore +++ b/src/modules/Oracle/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Oracle/.gitignore b/src/modules/Oracle/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Oracle/.gitignore +++ b/src/modules/Oracle/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Oracle/Makefile.in b/src/modules/Oracle/Makefile.in index 6d59aef6b2..72c4f04e7a 100644 --- a/src/modules/Oracle/Makefile.in +++ b/src/modules/Oracle/Makefile.in @@ -1,8 +1,8 @@ # -# $Id: Makefile.in,v 1.2 1999/04/23 21:37:07 grubba Exp $ +# $Id: Makefile.in,v 1.3 1999/11/18 08:00:30 hubbe Exp $ # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=oracle.o diff --git a/src/modules/Parser/.cvsignore b/src/modules/Parser/.cvsignore index ac7a4afa05..e3d2651bca 100644 --- a/src/modules/Parser/.cvsignore +++ b/src/modules/Parser/.cvsignore @@ -6,6 +6,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Parser/.gitignore b/src/modules/Parser/.gitignore index 4e3fcaefb4..d843df545f 100644 --- a/src/modules/Parser/.gitignore +++ b/src/modules/Parser/.gitignore @@ -6,6 +6,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Parser/Makefile.in b/src/modules/Parser/Makefile.in index 709c41ca9e..7f8401dad5 100644 --- a/src/modules/Parser/Makefile.in +++ b/src/modules/Parser/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.2 1999/04/23 21:37:27 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.3 1999/11/18 08:00:38 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=parser.o html.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/Perl/.cvsignore b/src/modules/Perl/.cvsignore index 1994e20440..0a1be682d4 100644 --- a/src/modules/Perl/.cvsignore +++ b/src/modules/Perl/.cvsignore @@ -5,6 +5,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Perl/.gitignore b/src/modules/Perl/.gitignore index 843fcebdd5..19967e920e 100644 --- a/src/modules/Perl/.gitignore +++ b/src/modules/Perl/.gitignore @@ -5,6 +5,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Perl/Makefile.in b/src/modules/Perl/Makefile.in index ea786e341c..1aab288d10 100644 --- a/src/modules/Perl/Makefile.in +++ b/src/modules/Perl/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.3 1999/04/23 21:37:46 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.4 1999/11/18 08:00:47 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ @PERL_LDFLAGS@ OBJS=perlmod.o @extra_objs@ diff --git a/src/modules/Pipe/.cvsignore b/src/modules/Pipe/.cvsignore index 4daaced033..a2372d7c30 100644 --- a/src/modules/Pipe/.cvsignore +++ b/src/modules/Pipe/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Pipe/.gitignore b/src/modules/Pipe/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Pipe/.gitignore +++ b/src/modules/Pipe/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Pipe/Makefile.in b/src/modules/Pipe/Makefile.in index 77fc09f1d0..5bc13e2224 100644 --- a/src/modules/Pipe/Makefile.in +++ b/src/modules/Pipe/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:38:09 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 08:00:56 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=pipe.o MODULE_LDFLAGS=@LDFLAGS@ diff --git a/src/modules/Postgres/.cvsignore b/src/modules/Postgres/.cvsignore index e0cdfc4217..8c2ee6fd7c 100644 --- a/src/modules/Postgres/.cvsignore +++ b/src/modules/Postgres/.cvsignore @@ -4,6 +4,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Postgres/.gitignore b/src/modules/Postgres/.gitignore index da2dacc0a3..56107e2056 100644 --- a/src/modules/Postgres/.gitignore +++ b/src/modules/Postgres/.gitignore @@ -4,6 +4,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Postgres/Makefile.in b/src/modules/Postgres/Makefile.in index 3e7539819d..c6a2d3c8bb 100644 --- a/src/modules/Postgres/Makefile.in +++ b/src/modules/Postgres/Makefile.in @@ -1,7 +1,7 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:38:32 grubba Exp $ +# $Id: Makefile.in,v 1.5 1999/11/18 08:01:05 hubbe Exp $ # (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it> -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/Regexp/.cvsignore b/src/modules/Regexp/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Regexp/.cvsignore +++ b/src/modules/Regexp/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Regexp/.gitignore b/src/modules/Regexp/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Regexp/.gitignore +++ b/src/modules/Regexp/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Regexp/Makefile.in b/src/modules/Regexp/Makefile.in index ea428bece2..d098c7d6f0 100644 --- a/src/modules/Regexp/Makefile.in +++ b/src/modules/Regexp/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.6 1999/04/23 21:38:55 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.7 1999/11/18 08:01:14 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=glue.o @REGEXP_OBJS@ MODULE_LDFLAGS=@LDFLAGS@ diff --git a/src/modules/Ssleay/.cvsignore b/src/modules/Ssleay/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Ssleay/.cvsignore +++ b/src/modules/Ssleay/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Ssleay/.gitignore b/src/modules/Ssleay/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Ssleay/.gitignore +++ b/src/modules/Ssleay/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Ssleay/Makefile.in b/src/modules/Ssleay/Makefile.in index 38d9588fcd..2583c7aaa8 100644 --- a/src/modules/Ssleay/Makefile.in +++ b/src/modules/Ssleay/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:39:18 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 08:01:22 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CFLAGS=@DEFS@ @CPPFLAGS@ OBJS=ssleay.o diff --git a/src/modules/Yp/.cvsignore b/src/modules/Yp/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/Yp/.cvsignore +++ b/src/modules/Yp/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/Yp/.gitignore b/src/modules/Yp/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/Yp/.gitignore +++ b/src/modules/Yp/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/Yp/Makefile.in b/src/modules/Yp/Makefile.in index 316dfe2808..ad01968f2d 100644 --- a/src/modules/Yp/Makefile.in +++ b/src/modules/Yp/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.4 1999/04/23 21:40:12 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.5 1999/11/18 08:01:31 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=yp.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/_Charset/.cvsignore b/src/modules/_Charset/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/_Charset/.cvsignore +++ b/src/modules/_Charset/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/_Charset/.gitignore b/src/modules/_Charset/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/_Charset/.gitignore +++ b/src/modules/_Charset/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/_Charset/Makefile.in b/src/modules/_Charset/Makefile.in index a2ea67ad90..9fa5921b07 100644 --- a/src/modules/_Charset/Makefile.in +++ b/src/modules/_Charset/Makefile.in @@ -1,8 +1,8 @@ # -# $Id: Makefile.in,v 1.3 1999/04/23 21:41:00 grubba Exp $ +# $Id: Makefile.in,v 1.4 1999/11/18 08:01:39 hubbe Exp $ # -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_CPPFLAGS=@DEFS@ @CPPFLAGS@ OBJS=charsetmod.o iso2022.o tables.o misc.o diff --git a/src/modules/_Crypto/.cvsignore b/src/modules/_Crypto/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/_Crypto/.cvsignore +++ b/src/modules/_Crypto/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/_Crypto/.gitignore b/src/modules/_Crypto/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/_Crypto/.gitignore +++ b/src/modules/_Crypto/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/_Crypto/Makefile.in b/src/modules/_Crypto/Makefile.in index 0882b71276..aa04a2b015 100644 --- a/src/modules/_Crypto/Makefile.in +++ b/src/modules/_Crypto/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.18 1999/04/23 21:41:37 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.19 1999/11/18 08:01:48 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. # BEGIN NATIONAL SECURITY diff --git a/src/modules/_Crypto/lib/.cvsignore b/src/modules/_Crypto/lib/.cvsignore index 8d540df7d3..8ff81c0961 100644 --- a/src/modules/_Crypto/lib/.cvsignore +++ b/src/modules/_Crypto/lib/.cvsignore @@ -10,5 +10,6 @@ desSmallCore.c desSmallFips.c desdata keymap.h +make_variables parity.h rotors.h diff --git a/src/modules/_Crypto/lib/.gitignore b/src/modules/_Crypto/lib/.gitignore index 067cdda10f..db4cfc348f 100644 --- a/src/modules/_Crypto/lib/.gitignore +++ b/src/modules/_Crypto/lib/.gitignore @@ -10,5 +10,6 @@ /desSmallFips.c /desdata /keymap.h +/make_variables /parity.h /rotors.h diff --git a/src/modules/_Image_JPEG/.cvsignore b/src/modules/_Image_JPEG/.cvsignore index 4c4abb584f..a2372d7c30 100644 --- a/src/modules/_Image_JPEG/.cvsignore +++ b/src/modules/_Image_JPEG/.cvsignore @@ -1,14 +1,15 @@ .pure Makefile +config.h +config.h.in config.log config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite stamp-h stamp-h.in -config.h -config.h.in diff --git a/src/modules/_Image_JPEG/.gitignore b/src/modules/_Image_JPEG/.gitignore index e9be9e8773..14854305fb 100644 --- a/src/modules/_Image_JPEG/.gitignore +++ b/src/modules/_Image_JPEG/.gitignore @@ -1,14 +1,15 @@ /.pure /Makefile +/config.h +/config.h.in /config.log /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite /stamp-h /stamp-h.in -/config.h -/config.h.in diff --git a/src/modules/_Image_JPEG/Makefile.in b/src/modules/_Image_JPEG/Makefile.in index 68a4515239..c568f0d232 100644 --- a/src/modules/_Image_JPEG/Makefile.in +++ b/src/modules/_Image_JPEG/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.3 1999/04/23 21:42:29 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.4 1999/11/18 08:02:05 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=image_jpeg.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/_Image_TIFF/.cvsignore b/src/modules/_Image_TIFF/.cvsignore index 4c4abb584f..a2372d7c30 100644 --- a/src/modules/_Image_TIFF/.cvsignore +++ b/src/modules/_Image_TIFF/.cvsignore @@ -1,14 +1,15 @@ .pure Makefile +config.h +config.h.in config.log config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite stamp-h stamp-h.in -config.h -config.h.in diff --git a/src/modules/_Image_TIFF/.gitignore b/src/modules/_Image_TIFF/.gitignore index e9be9e8773..14854305fb 100644 --- a/src/modules/_Image_TIFF/.gitignore +++ b/src/modules/_Image_TIFF/.gitignore @@ -1,14 +1,15 @@ /.pure /Makefile +/config.h +/config.h.in /config.log /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite /stamp-h /stamp-h.in -/config.h -/config.h.in diff --git a/src/modules/_Image_TIFF/Makefile.in b/src/modules/_Image_TIFF/Makefile.in index a221a5cbe8..4b64f3295c 100644 --- a/src/modules/_Image_TIFF/Makefile.in +++ b/src/modules/_Image_TIFF/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.2 1999/04/23 21:42:48 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.3 1999/11/18 08:02:16 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=image_tiff.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/_Image_TTF/.cvsignore b/src/modules/_Image_TTF/.cvsignore index ac7a4afa05..e3d2651bca 100644 --- a/src/modules/_Image_TTF/.cvsignore +++ b/src/modules/_Image_TTF/.cvsignore @@ -6,6 +6,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/_Image_TTF/.gitignore b/src/modules/_Image_TTF/.gitignore index 4e3fcaefb4..d843df545f 100644 --- a/src/modules/_Image_TTF/.gitignore +++ b/src/modules/_Image_TTF/.gitignore @@ -6,6 +6,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/_Image_TTF/Makefile.in b/src/modules/_Image_TTF/Makefile.in index 3ead484423..29db569162 100644 --- a/src/modules/_Image_TTF/Makefile.in +++ b/src/modules/_Image_TTF/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.2 1999/04/23 21:43:49 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.3 1999/11/18 08:02:25 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=image_ttf.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/_Image_XFace/.cvsignore b/src/modules/_Image_XFace/.cvsignore index 4c4abb584f..a2372d7c30 100644 --- a/src/modules/_Image_XFace/.cvsignore +++ b/src/modules/_Image_XFace/.cvsignore @@ -1,14 +1,15 @@ .pure Makefile +config.h +config.h.in config.log config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite stamp-h stamp-h.in -config.h -config.h.in diff --git a/src/modules/_Image_XFace/.gitignore b/src/modules/_Image_XFace/.gitignore index e9be9e8773..14854305fb 100644 --- a/src/modules/_Image_XFace/.gitignore +++ b/src/modules/_Image_XFace/.gitignore @@ -1,14 +1,15 @@ /.pure /Makefile +/config.h +/config.h.in /config.log /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite /stamp-h /stamp-h.in -/config.h -/config.h.in diff --git a/src/modules/_Image_XFace/Makefile.in b/src/modules/_Image_XFace/Makefile.in index c38cdd8491..393e8fcf2e 100644 --- a/src/modules/_Image_XFace/Makefile.in +++ b/src/modules/_Image_XFace/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.3 1999/04/23 21:44:11 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.4 1999/11/18 08:02:34 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=image_xface.o MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/modules/_math/.cvsignore b/src/modules/_math/.cvsignore index 046e7b953f..e782600f54 100644 --- a/src/modules/_math/.cvsignore +++ b/src/modules/_math/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module.pmod diff --git a/src/modules/_math/.gitignore b/src/modules/_math/.gitignore index 5251a94d2b..90415d1dab 100644 --- a/src/modules/_math/.gitignore +++ b/src/modules/_math/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module.pmod diff --git a/src/modules/_math/Makefile.in b/src/modules/_math/Makefile.in index 51608f5bda..c0438202cf 100644 --- a/src/modules/_math/Makefile.in +++ b/src/modules/_math/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.6 1999/04/23 21:45:17 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.7 1999/11/18 08:02:42 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. MODULE_LDFLAGS=@LIBS@ OBJS=math.o diff --git a/src/modules/call_out/.cvsignore b/src/modules/call_out/.cvsignore index 046e7b953f..e782600f54 100644 --- a/src/modules/call_out/.cvsignore +++ b/src/modules/call_out/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module.pmod diff --git a/src/modules/call_out/.gitignore b/src/modules/call_out/.gitignore index 5251a94d2b..90415d1dab 100644 --- a/src/modules/call_out/.gitignore +++ b/src/modules/call_out/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module.pmod diff --git a/src/modules/call_out/Makefile.in b/src/modules/call_out/Makefile.in index f749109fc5..514087802e 100644 --- a/src/modules/call_out/Makefile.in +++ b/src/modules/call_out/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.7 1999/04/23 21:44:34 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.8 1999/11/18 08:02:51 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=call_out.o MODULE_LDFLAGS=@LIBS@ diff --git a/src/modules/files/.cvsignore b/src/modules/files/.cvsignore index a5908ad49c..38083cc6c1 100644 --- a/src/modules/files/.cvsignore +++ b/src/modules/files/.cvsignore @@ -7,6 +7,7 @@ dependencies file_machine.h file_machine.h.in linker_options +make_variables modlist_headers modlist_segment module.pmod diff --git a/src/modules/files/.gitignore b/src/modules/files/.gitignore index 24404cbc9b..dfaa59e66a 100644 --- a/src/modules/files/.gitignore +++ b/src/modules/files/.gitignore @@ -7,6 +7,7 @@ /file_machine.h /file_machine.h.in /linker_options +/make_variables /modlist_headers /modlist_segment /module.pmod diff --git a/src/modules/files/Makefile.in b/src/modules/files/Makefile.in index 9a793bbd59..d71cf830c7 100644 --- a/src/modules/files/Makefile.in +++ b/src/modules/files/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.10 1999/07/15 17:36:33 mirar Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.11 1999/11/18 08:02:59 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=file.o efuns.o socket.o termios.o sendfile.o udp.o MODULE_LDFLAGS=@LIBS@ diff --git a/src/modules/spider/.cvsignore b/src/modules/spider/.cvsignore index c03762d717..d45d29b97f 100644 --- a/src/modules/spider/.cvsignore +++ b/src/modules/spider/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite diff --git a/src/modules/spider/.gitignore b/src/modules/spider/.gitignore index a5518ba7a2..14854305fb 100644 --- a/src/modules/spider/.gitignore +++ b/src/modules/spider/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite diff --git a/src/modules/spider/Makefile.in b/src/modules/spider/Makefile.in index ee9978d8b4..54982a1eef 100644 --- a/src/modules/spider/Makefile.in +++ b/src/modules/spider/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.18 1999/07/21 18:39:29 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.19 1999/11/18 08:03:08 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=spider.o discdate.o stardate.o xml.o MODULE_LDFLAGS=@LDFLAGS@ diff --git a/src/modules/sprintf/.cvsignore b/src/modules/sprintf/.cvsignore index 046e7b953f..e782600f54 100644 --- a/src/modules/sprintf/.cvsignore +++ b/src/modules/sprintf/.cvsignore @@ -7,6 +7,7 @@ config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module.pmod diff --git a/src/modules/sprintf/.gitignore b/src/modules/sprintf/.gitignore index 5251a94d2b..90415d1dab 100644 --- a/src/modules/sprintf/.gitignore +++ b/src/modules/sprintf/.gitignore @@ -7,6 +7,7 @@ /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module.pmod diff --git a/src/modules/sprintf/Makefile.in b/src/modules/sprintf/Makefile.in index 1980235197..cd5a8be0e8 100644 --- a/src/modules/sprintf/Makefile.in +++ b/src/modules/sprintf/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.7 1999/04/23 21:46:08 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.8 1999/11/18 08:03:18 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=sprintf.o MODULE_LDFLAGS=@LDFLAGS@ diff --git a/src/modules/system/.cvsignore b/src/modules/system/.cvsignore index b5760cc263..e549ef5a9b 100644 --- a/src/modules/system/.cvsignore +++ b/src/modules/system/.cvsignore @@ -1,10 +1,12 @@ .pure Makefile +add-errnos.h config.log config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module.pmod @@ -13,4 +15,3 @@ stamp-h stamp-h.in system_machine.h system_machine.h.in -add-errnos.h diff --git a/src/modules/system/.gitignore b/src/modules/system/.gitignore index 5096427aa0..c6f829995c 100644 --- a/src/modules/system/.gitignore +++ b/src/modules/system/.gitignore @@ -1,10 +1,12 @@ /.pure /Makefile +/add-errnos.h /config.log /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module.pmod @@ -13,4 +15,3 @@ /stamp-h.in /system_machine.h /system_machine.h.in -/add-errnos.h diff --git a/src/modules/system/Makefile.in b/src/modules/system/Makefile.in index 5361301318..82609be4e4 100644 --- a/src/modules/system/Makefile.in +++ b/src/modules/system/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.8 1999/04/23 21:46:27 grubba Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.9 1999/11/18 08:03:26 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../..:. OBJS=system.o syslog.o passwords.o nt.o MODULE_LDFLAGS=@LIBS@ diff --git a/src/post_modules/.cvsignore b/src/post_modules/.cvsignore index 6eb32af830..3bab8a5b51 100644 --- a/src/post_modules/.cvsignore +++ b/src/post_modules/.cvsignore @@ -6,6 +6,7 @@ dependencies dynamic_module_makefile lib_dirs linker_options +make_variables master_lib_dirs modlist.h modlist_headers.h diff --git a/src/post_modules/.gitignore b/src/post_modules/.gitignore index b5b99d53dc..c9cbf8546e 100644 --- a/src/post_modules/.gitignore +++ b/src/post_modules/.gitignore @@ -6,6 +6,7 @@ /dynamic_module_makefile /lib_dirs /linker_options +/make_variables /master_lib_dirs /modlist.h /modlist_headers.h diff --git a/src/post_modules/GL/.cvsignore b/src/post_modules/GL/.cvsignore index ae2922eca1..eddc272108 100644 --- a/src/post_modules/GL/.cvsignore +++ b/src/post_modules/GL/.cvsignore @@ -1,16 +1,17 @@ .pure Makefile +auto.c +config.cache config.h config.h.in config.log -config.cache config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite stamp-h stamp-h.in -auto.c diff --git a/src/post_modules/GL/.gitignore b/src/post_modules/GL/.gitignore index 1d89051b2f..19e622c6bf 100644 --- a/src/post_modules/GL/.gitignore +++ b/src/post_modules/GL/.gitignore @@ -1,16 +1,17 @@ /.pure /Makefile +/auto.c +/config.cache /config.h /config.h.in /config.log -/config.cache /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite /stamp-h /stamp-h.in -/auto.c diff --git a/src/post_modules/GL/Makefile.in b/src/post_modules/GL/Makefile.in index 9e1d8d1853..9bac59a06c 100644 --- a/src/post_modules/GL/Makefile.in +++ b/src/post_modules/GL/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.5 1999/11/15 19:13:10 neotron Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.6 1999/11/18 08:03:44 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=top.o @AUTO_OBJS@ MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/post_modules/GLUT/.cvsignore b/src/post_modules/GLUT/.cvsignore index ae2922eca1..eddc272108 100644 --- a/src/post_modules/GLUT/.cvsignore +++ b/src/post_modules/GLUT/.cvsignore @@ -1,16 +1,17 @@ .pure Makefile +auto.c +config.cache config.h config.h.in config.log -config.cache config.status configure dependencies linker_options +make_variables modlist_headers modlist_segment module_testsuite stamp-h stamp-h.in -auto.c diff --git a/src/post_modules/GLUT/.gitignore b/src/post_modules/GLUT/.gitignore index 1d89051b2f..19e622c6bf 100644 --- a/src/post_modules/GLUT/.gitignore +++ b/src/post_modules/GLUT/.gitignore @@ -1,16 +1,17 @@ /.pure /Makefile +/auto.c +/config.cache /config.h /config.h.in /config.log -/config.cache /config.status /configure /dependencies /linker_options +/make_variables /modlist_headers /modlist_segment /module_testsuite /stamp-h /stamp-h.in -/auto.c diff --git a/src/post_modules/GLUT/Makefile.in b/src/post_modules/GLUT/Makefile.in index 7d055c5ac5..c0ff4f7727 100644 --- a/src/post_modules/GLUT/Makefile.in +++ b/src/post_modules/GLUT/Makefile.in @@ -1,5 +1,5 @@ -# $Id: Makefile.in,v 1.2 1999/11/15 19:29:55 neotron Exp $ -SRCDIR=@srcdir@ +# $Id: Makefile.in,v 1.3 1999/11/18 08:03:52 hubbe Exp $ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../.. OBJS=top.o @AUTO@ MODULE_LDFLAGS=@LDFLAGS@ @LIBS@ diff --git a/src/post_modules/GTK/.cvsignore b/src/post_modules/GTK/.cvsignore index 2ec10f9270..bf932d0bfd 100755 --- a/src/post_modules/GTK/.cvsignore +++ b/src/post_modules/GTK/.cvsignore @@ -11,8 +11,10 @@ configure docs files_to_compile linker_options +make_variables modlist_headers modlist_segment options prototypes.h +sources stamp-h.in diff --git a/src/post_modules/GTK/.gitignore b/src/post_modules/GTK/.gitignore index d984c302b4..026230ba14 100755 --- a/src/post_modules/GTK/.gitignore +++ b/src/post_modules/GTK/.gitignore @@ -11,8 +11,10 @@ /docs /files_to_compile /linker_options +/make_variables /modlist_headers /modlist_segment /options /prototypes.h +/sources /stamp-h.in diff --git a/src/post_modules/GTK/Makefile.in b/src/post_modules/GTK/Makefile.in index f2780335a2..4fa7306a13 100644 --- a/src/post_modules/GTK/Makefile.in +++ b/src/post_modules/GTK/Makefile.in @@ -1,5 +1,5 @@ # This line is needed on some machines. -SRCDIR=@srcdir@ +@make_variables@ VPATH=@srcdir@:@srcdir@/../..:../..:. MODNAME=GTK DEST=@prefix@/lib/pike/modules/ diff --git a/src/post_modules/Makefile.in b/src/post_modules/Makefile.in index be7a52908b..3ad8ca3fbf 100644 --- a/src/post_modules/Makefile.in +++ b/src/post_modules/Makefile.in @@ -1,18 +1,11 @@ -# $Id: Makefile.in,v 1.1 1999/11/07 01:33:42 per Exp $ +# $Id: Makefile.in,v 1.2 1999/11/18 08:03:35 hubbe Exp $ -@SET_MAKE@ - -CC=@CC@ -CPP=@CPP@ -SRCDIR=@srcdir@ -AR=@AR@ +@make_variables@ MODULES=@subdirs@ MODULE_SEGMENTS=@MODULE_SEGMENTS@ MODULE_LINKOPTS=@MODULE_LINKOPTS@ -MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "OTHERFLAGS=$(OTHERFLAGS)" "TMP_BINDIR=$(TMP_BINDIR)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "DEFINES=$(DEFINES)" "INSTALL=$(INSTALL)" "AR=$(AR)" LDFLAGS="$(LDFLAGS)" "CC=$(CC)" "MAKE=$(MAKE)" "NOOPTFLAGS=$(NOOPTFLAGS)" - all: linker_options modlist.h modlist_headers.h $(MODULE_SEGMENTS) $(MODULE_LINKOPTS): modules -- GitLab