From: Guenter Knauf Date: Fri, 18 Mar 2011 03:09:27 +0000 (+0000) Subject: Use var for prelude so its possible to change it at one place. X-Git-Tag: 2.3.12~209 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab978c56e7dce2343bed85b9aac98cee8b856e8;p=thirdparty%2Fapache%2Fhttpd.git Use var for prelude so its possible to change it at one place. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NWGNUmakefile b/NWGNUmakefile index 431aec8806d..27fc085f0d9 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -297,7 +297,7 @@ endif # FILES_nlm_libs = \ $(PCRELIB) \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 1510747e54c..87a7659f729 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -174,6 +174,7 @@ endif endif NOVI = $(NOVELLLIBC)/imports +PRELUDE = $(NOVI)/libcpre.o INCDIRS = $(NOVELLLIBC)/include; ifndef USE_STDSOCKETS diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 4b7701e8fdc..efdd8f03f9c 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -209,8 +209,6 @@ endif # Rules to build nlms. # -vpath libcpre.o $(NOVI) - # If we only have one target NLM then build it ifeq "$(words $(strip $(TARGET_nlm)))" "1" diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat index fae1c8a8a8d..bfa7b201051 100644 --- a/modules/aaa/NWGNUaccesscompat +++ b/modules/aaa/NWGNUaccesscompat @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUallowmethods b/modules/aaa/NWGNUallowmethods index 1be811d719a..c2373f574b1 100644 --- a/modules/aaa/NWGNUallowmethods +++ b/modules/aaa/NWGNUallowmethods @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc index b6f00a681a1..1f434640bbb 100644 --- a/modules/aaa/NWGNUauthbasc +++ b/modules/aaa/NWGNUauthbasc @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt index 20d8c38b10e..39738f21996 100644 --- a/modules/aaa/NWGNUauthdigt +++ b/modules/aaa/NWGNUauthdigt @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthform b/modules/aaa/NWGNUauthform index e8e3e25a675..5b42ab50c44 100644 --- a/modules/aaa/NWGNUauthform +++ b/modules/aaa/NWGNUauthform @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano index 23a0f034aac..b115314d8bf 100644 --- a/modules/aaa/NWGNUauthnano +++ b/modules/aaa/NWGNUauthnano @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd index 97e678d410b..151bc1c2d08 100644 --- a/modules/aaa/NWGNUauthndbd +++ b/modules/aaa/NWGNUauthndbd @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm index d8e5c602ebe..1f9880e9aab 100644 --- a/modules/aaa/NWGNUauthndbm +++ b/modules/aaa/NWGNUauthndbm @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil index 721c797b5d6..cfab2876971 100644 --- a/modules/aaa/NWGNUauthnfil +++ b/modules/aaa/NWGNUauthnfil @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache index c0a8a2557a1..8d1b347e266 100644 --- a/modules/aaa/NWGNUauthnsocache +++ b/modules/aaa/NWGNUauthnsocache @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap index 485272ef815..bfe21dbedef 100644 --- a/modules/aaa/NWGNUauthnzldap +++ b/modules/aaa/NWGNUauthnzldap @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd index 87347763ccf..3ea2ba72ba4 100644 --- a/modules/aaa/NWGNUauthzdbd +++ b/modules/aaa/NWGNUauthzdbd @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm index 8a8392398e7..3d0ed8f57bc 100644 --- a/modules/aaa/NWGNUauthzdbm +++ b/modules/aaa/NWGNUauthzdbm @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp index 9dce54227b0..4a8df2cb9b4 100644 --- a/modules/aaa/NWGNUauthzgrp +++ b/modules/aaa/NWGNUauthzgrp @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr index 22028d59d0c..aa790538ad4 100644 --- a/modules/aaa/NWGNUauthzusr +++ b/modules/aaa/NWGNUauthzusr @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cache/NWGNUcach_dsk b/modules/cache/NWGNUcach_dsk index 2c76d81c8fd..be925da171e 100644 --- a/modules/cache/NWGNUcach_dsk +++ b/modules/cache/NWGNUcach_dsk @@ -182,7 +182,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach index a56f64f5e53..b17b6b69b3b 100644 --- a/modules/cache/NWGNUmod_cach +++ b/modules/cache/NWGNUmod_cach @@ -185,7 +185,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cache/NWGNUsocachdbm b/modules/cache/NWGNUsocachdbm index 2bbcf8abb6f..dc06af7df91 100644 --- a/modules/cache/NWGNUsocachdbm +++ b/modules/cache/NWGNUsocachdbm @@ -182,7 +182,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cache/NWGNUsocachmem b/modules/cache/NWGNUsocachmem index abccb296b31..d8d10d8a345 100644 --- a/modules/cache/NWGNUsocachmem +++ b/modules/cache/NWGNUsocachmem @@ -182,7 +182,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cache/NWGNUsocachshmcb b/modules/cache/NWGNUsocachshmcb index 180ef52c8a9..8f11c4b648d 100644 --- a/modules/cache/NWGNUsocachshmcb +++ b/modules/cache/NWGNUsocachshmcb @@ -182,7 +182,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat index 44e80ee821a..b2c3ece2192 100644 --- a/modules/cluster/NWGNUmodheartbeat +++ b/modules/cluster/NWGNUmodheartbeat @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor index f4254e1c7d9..2436b277fde 100644 --- a/modules/cluster/NWGNUmodheartmonitor +++ b/modules/cluster/NWGNUmodheartmonitor @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index 4598b638125..e4010a5787a 100644 --- a/modules/database/NWGNUmakefile +++ b/modules/database/NWGNUmakefile @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index dcbb12d0eff..15c07df2aa6 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -181,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index f790e7f1733..4f7c794e968 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index bb52da97551..1c14d6d4809 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -188,7 +188,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer index 4441a3b97be..54cdac6f167 100644 --- a/modules/debugging/NWGNUmodbucketeer +++ b/modules/debugging/NWGNUmodbucketeer @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio index d2c281c7854..4d4a9848f32 100644 --- a/modules/debugging/NWGNUmoddumpio +++ b/modules/debugging/NWGNUmoddumpio @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index 6c99a857cd1..d480347f4a6 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt index 9c215d08820..df9a86f4989 100644 --- a/modules/examples/NWGNUcase_flt +++ b/modules/examples/NWGNUcase_flt @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in index aeffa975d92..7429a44a03d 100644 --- a/modules/examples/NWGNUcase_flt_in +++ b/modules/examples/NWGNUcase_flt_in @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks index 1948073ba5c..06bc16ad056 100644 --- a/modules/examples/NWGNUexample_hooks +++ b/modules/examples/NWGNUexample_hooks @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc index 408e7989fdb..605794b2a4a 100644 --- a/modules/examples/NWGNUexample_ipc +++ b/modules/examples/NWGNUexample_ipc @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/experimental/NWGNUnoloris b/modules/experimental/NWGNUnoloris index df51ae8fff0..d1a9a96c046 100644 --- a/modules/experimental/NWGNUnoloris +++ b/modules/experimental/NWGNUnoloris @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl index 7bae0e547b3..99326354d66 100644 --- a/modules/filters/NWGNUcharsetl +++ b/modules/filters/NWGNUcharsetl @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index 1a11f9710f3..e463ab39f41 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -197,7 +197,7 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr index aa2e64d6234..1fd57cb00c8 100644 --- a/modules/filters/NWGNUextfiltr +++ b/modules/filters/NWGNUextfiltr @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter index 6aaa06a6eaf..bf323ee753b 100644 --- a/modules/filters/NWGNUmod_filter +++ b/modules/filters/NWGNUmod_filter @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmod_request b/modules/filters/NWGNUmod_request index 684539bc13f..21f53cc140c 100644 --- a/modules/filters/NWGNUmod_request +++ b/modules/filters/NWGNUmod_request @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer index df525bdd62a..7652a358f40 100644 --- a/modules/filters/NWGNUmodbuffer +++ b/modules/filters/NWGNUmodbuffer @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUmodsed b/modules/filters/NWGNUmodsed index 487ace5fbc3..158acb9d77c 100644 --- a/modules/filters/NWGNUmodsed +++ b/modules/filters/NWGNUmodsed @@ -181,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit index ceed35ff52a..f75c81408dc 100644 --- a/modules/filters/NWGNUratelimit +++ b/modules/filters/NWGNUratelimit @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUreflector b/modules/filters/NWGNUreflector index 9fdb0e76141..67ca26d9de3 100644 --- a/modules/filters/NWGNUreflector +++ b/modules/filters/NWGNUreflector @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout index 4ff7c7786e5..a99f82c4247 100644 --- a/modules/filters/NWGNUreqtimeout +++ b/modules/filters/NWGNUreqtimeout @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute index 09cb3682fec..e5775f285dc 100644 --- a/modules/filters/NWGNUsubstitute +++ b/modules/filters/NWGNUsubstitute @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex index 535f9073768..e8080c36597 100644 --- a/modules/generators/NWGNUautoindex +++ b/modules/generators/NWGNUautoindex @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo index 633f24f0806..810db8a2351 100644 --- a/modules/generators/NWGNUinfo +++ b/modules/generators/NWGNUinfo @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis index ece1c580945..c7df5ae8e68 100644 --- a/modules/generators/NWGNUmod_asis +++ b/modules/generators/NWGNUmod_asis @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi index a555163afff..bbb95784b84 100644 --- a/modules/generators/NWGNUmod_cgi +++ b/modules/generators/NWGNUmod_cgi @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus index dbabe667de4..1dc850e28aa 100644 --- a/modules/generators/NWGNUstatus +++ b/modules/generators/NWGNUstatus @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile index 3a0dce35e5a..9d21f9941b5 100644 --- a/modules/ldap/NWGNUmakefile +++ b/modules/ldap/NWGNUmakefile @@ -181,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index c3e45946a63..56587d73792 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index c58ef778006..186e6727783 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -179,7 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile index 629f15950d5..c7a4f6e089c 100644 --- a/modules/lua/NWGNUmakefile +++ b/modules/lua/NWGNUmakefile @@ -187,7 +187,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(OBJDIR)/lua.lib \ $(EOLIST) diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions index 12e078a6c42..3a94773cd1a 100644 --- a/modules/mappers/NWGNUactions +++ b/modules/mappers/NWGNUactions @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap index 12f972f3b21..7f6608600cf 100644 --- a/modules/mappers/NWGNUimagemap +++ b/modules/mappers/NWGNUimagemap @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite index 9ec824f1069..d16dd8e2bb9 100644 --- a/modules/mappers/NWGNUrewrite +++ b/modules/mappers/NWGNUrewrite @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling index 68ac5fa969f..6982988dad0 100644 --- a/modules/mappers/NWGNUspeling +++ b/modules/mappers/NWGNUspeling @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir index 09f47efe8f4..b0fc7a01ded 100644 --- a/modules/mappers/NWGNUuserdir +++ b/modules/mappers/NWGNUuserdir @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost index 69b4f88381c..d3b655c698c 100644 --- a/modules/mappers/NWGNUvhost +++ b/modules/mappers/NWGNUvhost @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta index 5a193137ebc..64a7cb7a911 100644 --- a/modules/metadata/NWGNUcernmeta +++ b/modules/metadata/NWGNUcernmeta @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires index 39c39353ee5..e9601b0edb1 100644 --- a/modules/metadata/NWGNUexpires +++ b/modules/metadata/NWGNUexpires @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders index f5fe0aed215..77ae60d1b8a 100644 --- a/modules/metadata/NWGNUheaders +++ b/modules/metadata/NWGNUheaders @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi index 0ed184b0a93..ae508fffab1 100644 --- a/modules/metadata/NWGNUmimemagi +++ b/modules/metadata/NWGNUmimemagi @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident index fa5880fb962..8ce871d8326 100644 --- a/modules/metadata/NWGNUmodident +++ b/modules/metadata/NWGNUmodident @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion index 27423ea27c0..756b57212ba 100644 --- a/modules/metadata/NWGNUmodversion +++ b/modules/metadata/NWGNUmodversion @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUremoteip b/modules/metadata/NWGNUremoteip index 69f80cdc0d3..8e9ddb5921d 100644 --- a/modules/metadata/NWGNUremoteip +++ b/modules/metadata/NWGNUremoteip @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index ed71d67b611..d39a57e1fa5 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk index b39b88d530b..1be79de1570 100644 --- a/modules/metadata/NWGNUusertrk +++ b/modules/metadata/NWGNUusertrk @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index 538001b11e6..8b95ada8ed0 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -175,7 +175,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp index 108f1ed02a8..7256fdaaef3 100644 --- a/modules/proxy/NWGNUproxyajp +++ b/modules/proxy/NWGNUproxyajp @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer index a5758e20107..86013923d1f 100644 --- a/modules/proxy/NWGNUproxybalancer +++ b/modules/proxy/NWGNUproxybalancer @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon index 4728f86cd87..994f4b56f73 100644 --- a/modules/proxy/NWGNUproxycon +++ b/modules/proxy/NWGNUproxycon @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi index c818d6c7469..4545cb0f41b 100644 --- a/modules/proxy/NWGNUproxyfcgi +++ b/modules/proxy/NWGNUproxyfcgi @@ -174,7 +174,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 7a2a1cf03ab..47db54d16f0 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index f5bd53d9f60..07aa4d8188f 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi index 749e2b6e29e..b7abf9cfdad 100644 --- a/modules/proxy/NWGNUproxyscgi +++ b/modules/proxy/NWGNUproxyscgi @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf index 341a92dccde..c9ba6a4fc52 100644 --- a/modules/proxy/NWGNUserf +++ b/modules/proxy/NWGNUserf @@ -232,7 +232,7 @@ endif FILES_nlm_libs = \ $(OSSLLIB)/crypto.lib \ $(OSSLLIB)/ssl.lib \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession b/modules/session/NWGNUsession index 689d22812db..deed69140e0 100644 --- a/modules/session/NWGNUsession +++ b/modules/session/NWGNUsession @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_cookie b/modules/session/NWGNUsession_cookie index bf2f6268c5e..60dfe0d2c91 100644 --- a/modules/session/NWGNUsession_cookie +++ b/modules/session/NWGNUsession_cookie @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_crypto b/modules/session/NWGNUsession_crypto index 2d5208a8c54..cc4eb315471 100644 --- a/modules/session/NWGNUsession_crypto +++ b/modules/session/NWGNUsession_crypto @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/session/NWGNUsession_dbd b/modules/session/NWGNUsession_dbd index 483bb1a14b1..252a70fed81 100644 --- a/modules/session/NWGNUsession_dbd +++ b/modules/session/NWGNUsession_dbd @@ -174,7 +174,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/slotmem/NWGNUslotmem_plain b/modules/slotmem/NWGNUslotmem_plain index 37e358b6ae9..a66504a6961 100644 --- a/modules/slotmem/NWGNUslotmem_plain +++ b/modules/slotmem/NWGNUslotmem_plain @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/slotmem/NWGNUslotmem_shm b/modules/slotmem/NWGNUslotmem_shm index 80212023667..515569318da 100644 --- a/modules/slotmem/NWGNUslotmem_shm +++ b/modules/slotmem/NWGNUslotmem_shm @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 5965bfc111f..37e0236154a 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -217,7 +217,7 @@ FILES_nlm_objs := $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard *.c)) # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifneq "$(USE_NTLS)" "1" diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport index 32a1a6d894c..449d26e943a 100644 --- a/modules/test/NWGNUoptfnexport +++ b/modules/test/NWGNUoptfnexport @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport index 1861243d3ec..cd09d392e48 100644 --- a/modules/test/NWGNUoptfnimport +++ b/modules/test/NWGNUoptfnimport @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport index 3c556343cb4..04723869f17 100644 --- a/modules/test/NWGNUopthookexport +++ b/modules/test/NWGNUopthookexport @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/modules/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport index e0bf3062bd0..ef4d3dcd7ab 100644 --- a/modules/test/NWGNUopthookimport +++ b/modules/test/NWGNUopthookimport @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/server/NWGNUmakefile b/server/NWGNUmakefile index bffd33d976d..7f96e81e126 100644 --- a/server/NWGNUmakefile +++ b/server/NWGNUmakefile @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUab b/support/NWGNUab index 07e8f0a3895..c22b6c16edb 100644 --- a/support/NWGNUab +++ b/support/NWGNUab @@ -220,7 +220,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifdef HAVE_OPENSSL diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean index c18a24a5633..f81352781de 100644 --- a/support/NWGNUhtcacheclean +++ b/support/NWGNUhtcacheclean @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm index 7bfa67d35fc..05ee0341387 100644 --- a/support/NWGNUhtdbm +++ b/support/NWGNUhtdbm @@ -176,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest index 14c2be54167..fa5abc11fa9 100644 --- a/support/NWGNUhtdigest +++ b/support/NWGNUhtdigest @@ -176,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd index f73287c31ed..66f424749e9 100644 --- a/support/NWGNUhtpasswd +++ b/support/NWGNUhtpasswd @@ -176,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm index b361ecaa1f9..c33532dda33 100644 --- a/support/NWGNUhttxt2dbm +++ b/support/NWGNUhttxt2dbm @@ -176,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUlogres b/support/NWGNUlogres index 915d3c67875..33ccfe0e32d 100644 --- a/support/NWGNUlogres +++ b/support/NWGNUlogres @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs index 4074d629d92..fb9e3ae3c84 100644 --- a/support/NWGNUrotlogs +++ b/support/NWGNUrotlogs @@ -175,7 +175,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) #