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 431aec8806dc9d9f889897cd0e27516f6d9753dc..27fc085f0d94ee83263920e18ee55418725d8f07 100644 (file)
--- 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 1510747e54c3dee636f1f52ace24e1bbe7cf1b3d..87a7659f72965e709e627cce75da23b55b1e8a93 100644 (file)
--- 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 4b7701e8fdc3acc8883b5ea937dbd9c39fe5fbb5..efdd8f03f9c11d84dad06808372dacffde915878 100644 (file)
--- 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 fae1c8a8a8d663b7a3a42cf11ec6536f1e8f8aa8..bfa7b2010517e14375d1414fdb19e0fb13c2dc05 100644 (file)
--- 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 1be811d719a8dae40ffcb97987afdf4ae5fb587e..c2373f574b12d6f6b136ed8a17c880b5f04d7ff1 100644 (file)
--- 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 b6f00a681a15479ebd4e0cff8dbfe155f53502a2..1f434640bbbc31b7599cb14a71af07ce1a077a41 100644 (file)
--- 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 20d8c38b10e210517f7811a541e6c27209cb0c7e..39738f219963c5cf5943e53eb1a79c4d0a1b00db 100644 (file)
--- 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 e8e3e25a6757d75b1bab2dcd080491ac0aedbbba..5b42ab50c4495ce1a8d524b0e6d776f356f5b206 100644 (file)
--- 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 23a0f034aac00287f881d43a7502b1e8585a2220..b115314d8bfed5e92e2e0d4753bafda33f1c6916 100644 (file)
--- 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 97e678d410babea05598706808d2daeda38745d8..151bc1c2d08b45d9bd55adc5ee9b6f97f8dc31ef 100644 (file)
--- 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 d8e5c602ebea0f4fdadfe96f2e04a506fc70ced6..1f9880e9aabb45a9916964862486db95834bf11d 100644 (file)
--- 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 721c797b5d678ff2f90ab4a4d74bd8bdaae0688e..cfab287697158bfe31d72691dbc41d64ff8f674e 100644 (file)
--- 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 c0a8a2557a1bcc21ac8892ced66929b853b83e8d..8d1b347e266c28c9be43625ac645f0efed747d81 100644 (file)
--- 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 485272ef81530c2fb963cf336e944c2a841bc339..bfe21dbedef296dbe19b2fafd4ce0df18423b353 100644 (file)
--- 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 87347763ccff3fdf16f9e68417f7c08d4fbbf741..3ea2ba72ba49bce85ba35b0b229fea068a9579c7 100644 (file)
--- 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 8a8392398e7c5f5afce6a7f83d5a228205d8e7bc..3d0ed8f57bcf5440e80713e2b270c5a1bfc76924 100644 (file)
--- 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 9dce54227b0bac3c81e3cfefed6a876670e10fc0..4a8df2cb9b40ee09e9758cabec7b02818e2fab89 100644 (file)
--- 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 22028d59d0c8871f104655b1f17353ff4d617d73..aa790538ad42e4613deb046b526cf432ccfa3ece 100644 (file)
--- 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 2c76d81c8fdc9e7e15d073a9d1f17cca9987d2ca..be925da171e2b95f7d18d52bd5d98a286a49c068 100644 (file)
--- 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 a56f64f5e53f26866e31268cb8a979d46e680fa8..b17b6b69b3b683232611667fcd77535e883c9c15 100644 (file)
--- 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 2bbcf8abb6ff62f212204ca90ef2572613b305eb..dc06af7df91433fe66ebc29ec308c69d488e5ebf 100644 (file)
--- 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 abccb296b3122c5ab726a89f9bd3c25439ed1849..d8d10d8a34506f0a30c6c20eac858bc4376696db 100644 (file)
--- 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 180ef52c8a9c67939997f12425008aa711b5512f..8f11c4b648d91272fd425f883cd104f357ea5a0d 100644 (file)
--- 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 44e80ee821a8b5a1182c725a5e061ebc4966e764..b2c3ece2192ac33c09d4131750ecebabe309fef4 100644 (file)
--- 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 f4254e1c7d9c9ea56d0a1bf2573d323a422999a1..2436b277fdee649c2a72ddf9f951e695d6a4e8bb 100644 (file)
--- 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 4598b638125ffddc70db842fc2772b054c6ba6d9..e4010a5787a2b0019d66c338dff3ec568a165fc0 100644 (file)
--- 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 dcbb12d0eff34b4a8d820310e9d3ed5f6b1ad02a..15c07df2aa6ad1836423f5324f1244ace26b4a59 100644 (file)
--- 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 f790e7f1733b830872cf2b2d0eb6fe65f00521ff..4f7c794e9689b98cc0c95fb95205e067a8b26db0 100644 (file)
--- 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 bb52da97551d1634888387d16d3067280cfed3e8..1c14d6d480981eed335a40e8d2c87698ae363f4d 100644 (file)
--- 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 4441a3b97be3a322a5c0c5f195ba6b2ca5984707..54cdac6f167103ee434be785bd264a90a659f9ed 100644 (file)
--- 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 d2c281c78548a75ff9753ecbdacfd1cad9ac26e5..4d4a9848f329242e3b9096528af06fcfbf9fc64c 100644 (file)
--- 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 6c99a857cd152f0d8cb7db912f4cfcf33ae40a48..d480347f4a63f9a7bce3fb602584c81ec728e354 100644 (file)
--- 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 9c215d088206fbf6c2810e44f34526f1c22891a1..df9a86f49892d09546f8c61a4a0f52dfc4ffcb1e 100644 (file)
--- 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 aeffa975d92f891b1b7e195b21ad4a54d2308f23..7429a44a03d71b7f5bad4fee90dde238c72271fb 100644 (file)
--- 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 1948073ba5c0eabc502c1f559453f844385bb994..06bc16ad056a7100362d6c0796ebd9ee802b4f2f 100644 (file)
--- 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 408e7989fdbfe525d0307b54bf0e926906e4ade8..605794b2a4a81619e3e1cd5625a8e9c382a90d46 100644 (file)
--- 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 df51ae8fff0083901a91ab4d982648c7941d352a..d1a9a96c04636a62490a5ff1f8100cef24cee1b5 100644 (file)
--- 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 7bae0e547b389eeb4b631ed458fd07b91eeddb28..99326354d66be61e7a408c5537c587401585e944 100644 (file)
--- 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 1a11f9710f305a5080e2433712743155f9fead67..e463ab39f41aa54be2f018da5f7867d19844ca29 100644 (file)
--- 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 aa2e64d623471578c105c76a969639b18c235a96..1fd57cb00c8abd75df84862279c5e53ba5cc7c33 100644 (file)
--- 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 6aaa06a6eaf59040d7bfc455a4504e5753f2f300..bf323ee753b4710517ddab66c0c1744e0169a64d 100644 (file)
--- 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 684539bc13f71798304175a2608c0de06f90443d..21f53cc140cd937f17e648c0cc69d3a1a7e1dd48 100644 (file)
--- 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 df525bdd62a74f38c24c0935c7f1a330e3d8db2e..7652a358f401576ba27015a3767b52e2c484b655 100644 (file)
--- 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 487ace5fbc3d06595822f59d932518baffd114cc..158acb9d77c46b907b82beb655aea5aee2f36ac8 100644 (file)
--- 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 ceed35ff52ac2a6a9e5468deaf0b6c7d801a452d..f75c81408dc4ff62c4039494909d7940a43829b9 100644 (file)
--- 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 9fdb0e7614105863829d9362954ec8bac13b3ec1..67ca26d9de3b528a5dda47db4819b1bff19c6abe 100644 (file)
--- 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 4ff7c7786e5bd22ce164ec6fbd27d7924a648916..a99f82c4247dcd572cef5e14021783df576dc74e 100644 (file)
--- 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 09cb3682fec24ba6b35c67071d79bcd93e21b17a..e5775f285dc92d4702f6a2002bb556cf321348b8 100644 (file)
--- 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 535f9073768b1c395144d1b0f88ff8911407beb3..e8080c365975683f16115462719a61edf00ed24c 100644 (file)
--- 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 633f24f08063128a91ccfea1fa809c199e941f5f..810db8a2351a4e5c8ee4f55187cc36a2fc771ae8 100644 (file)
--- 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 ece1c580945e04bc919eb33b91d40703a5164135..c7df5ae8e68f1bf0f13a6fd7a3b3159297ca18b2 100644 (file)
--- 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 a555163afff85419d9d4cd8570f1150b98c7b250..bbb95784b842b43f519f49b2868db6dcb8a66c2a 100644 (file)
--- 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 dbabe667de469f9d9970682d0eedb074ff03ba53..1dc850e28aa7b96795594210d9434decdfcbfd83 100644 (file)
--- 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 3a0dce35e5a4f399cb9740fe7c2830728b6e8901..9d21f9941b5e1473d1603a5acfc8bcdc83c1808e 100644 (file)
--- 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 c3e45946a6395f21656a85bf2f6fb6c9b3937b61..56587d73792ccfbfafb481b2f9867c266437dda9 100644 (file)
--- 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 c58ef77800605ffd4913a4fc220e31a76d4a87ca..186e67277833bd526e8b2e33475baebe4e937a14 100644 (file)
--- 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 629f15950d5b75446ef25d218160fae442ac78df..c7a4f6e089c56b5618ce096d3fd6132b2a86c684 100644 (file)
--- 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 12e078a6c42eee79f4c57757bce2aa9ea7026afa..3a94773cd1a1a150baf94282c1c05e075233f161 100644 (file)
--- 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 12f972f3b21d086b52a16d30361d2b9eba66a5e2..7f6608600cf5eedb42897b487b6e4f914428cb18 100644 (file)
--- 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 9ec824f10699e4f37033023e06f18b0863b0358d..d16dd8e2bb9e995d3f7b453e36d277a8f45e1eef 100644 (file)
--- 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 68ac5fa969fd0e852b038fa7a7a76ac713c1e067..6982988dad0ef8de713f5948455372dda8ff23f6 100644 (file)
--- 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 09f47efe8f4a7f04deaac66956019d889a1670ee..b0fc7a01ded46e0ea8e67fa55195a56664b73a21 100644 (file)
--- 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 69b4f88381c0838e245411b18e883b0ea03649e1..d3b655c698ce6ebc4d8ee31170b923dd04a9f08f 100644 (file)
--- 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 5a193137ebcd267c40e99d19afec76f7a3a76caa..64a7cb7a9115acf9577538a10f71d8478410209e 100644 (file)
--- 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 39c39353ee5853e53547e4731cebfc6893d83e31..e9601b0edb1cc20db935406c3befd7dd64b998e2 100644 (file)
--- 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 f5fe0aed21533c94eaf7b2ad886e6493051d3561..77ae60d1b8a737dd14a35607d6471015e48b230a 100644 (file)
--- 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 0ed184b0a9349df6838e53b9e9a6d503e710289b..ae508fffab13dc891c7775d88afe9c865f2a72cc 100644 (file)
--- 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 fa5880fb962af52f18373be08f351c415ee2da28..8ce871d83261923f6a3f88ca96e71d5d4ed70c36 100644 (file)
--- 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 27423ea27c01734ecc1ae819f58d9ba039a614b4..756b57212bae69845bfeaaedad65976f464bc4e9 100644 (file)
--- 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 69f80cdc0d3dd38ef15cf98b5016d947550d8384..8e9ddb5921dc73cf7f61e40ebdf13391ca0a5443 100644 (file)
--- 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 ed71d67b611bd671fa2c03c5e29a6b0004e6b54c..d39a57e1fa5b92284864b1a93e1d2e8e28712ef6 100644 (file)
--- 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 b39b88d530ba5097d08d88c6d893b3be6c55bbcf..1be79de1570556a1c8b283488b95304e87273f84 100644 (file)
--- 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 538001b11e6ad1036e6d383030999d21c3b357c7..8b95ada8ed0011371063433cd4056a0a870215fb 100644 (file)
--- 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 108f1ed02a882fe1ffbafafedb504db572ac8c6b..7256fdaaef342369ffb668ffbddf840008d86bdb 100644 (file)
--- 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 a5758e2010798872e9b40df8096f7b4f6a04eca5..86013923d1f7e88b9abd53d44d58ca27f6a84a2c 100644 (file)
--- 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 4728f86cd87e87403dee597e1ad8a60a6270322e..994f4b56f73244ddcce0a68d964ea427380bd416 100644 (file)
--- 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 c818d6c746969f78e9ce19c47f924cce98e9ceef..4545cb0f41b15806674c6bed59c4e35b97322cfe 100644 (file)
--- 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 7a2a1cf03ab5b9742668a9237d17954be8da14f9..47db54d16f0e977b9fde88ebf1c64ace171401ed 100644 (file)
--- 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 f5bd53d9f60ce2a0b2af16f9ff35d0b7c3f6f542..07aa4d8188f0b3a81a70c5fd14c8212656a02e48 100644 (file)
--- 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 749e2b6e29e8105ac767a4f31287dba46b2d081c..b7abf9cfdade6ee441f5c833c80da74d049d63d3 100644 (file)
--- 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 341a92dccde8188d38db396b59d78747f4613238..c9ba6a4fc528b4f76eae6cc034c38675872b65d8 100644 (file)
--- 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 689d22812db7c5f37eb3837201ff9ab53c5ed904..deed69140e0250470780c6dd5467467bc554f881 100644 (file)
--- 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 bf2f6268c5ec03732a328f7907e96441d42c5582..60dfe0d2c9141e3047bd29273428aba39368a74f 100644 (file)
--- 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 2d5208a8c54043369a760289b519f86099dd8255..cc4eb3154719e1c78ed4e76d17853e6e81289389 100644 (file)
--- 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 483bb1a14b139bed553182bb337a97e311127b44..252a70fed81d81680f5c3cca3da085fa52696a5e 100644 (file)
--- 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 37e358b6ae98588ca559eb10c9617ca275287475..a66504a69617aec35814ef40ef6dec685158513f 100644 (file)
--- 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 80212023667a0bdfc68f6dffc12dd57872724af7..515569318dac6699056c4b45dd649d8a3fb9f0d8 100644 (file)
--- 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 5965bfc111f884f22f0c702aa6b42da7bfc4e4d1..37e0236154a0ccdadff77e70bd5e43b57e011b99 100644 (file)
--- 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 32a1a6d894c4e68d938fd96215653579e707172a..449d26e943ac22f2cf99c19f728b1e5814d21583 100644 (file)
--- 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 1861243d3ec1b633d69d4ec17de6c45a37777fc6..cd09d392e482f5c3157cf47aedb400378296fb4c 100644 (file)
--- 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 3c556343cb47a8fe06ef53b44055e79cc54d0108..04723869f17386f752f397f6ec275304a55898f5 100644 (file)
--- 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 e0bf3062bd0838af032801f279eb16b22843678f..ef4d3dcd7ab1bd32dd45c93473f6367edd497529 100644 (file)
--- 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 bffd33d976d4931ce248e5ee319e8460c0c1146a..7f96e81e126fd79cd572d13e15168e18935678ec 100644 (file)
--- 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 07e8f0a3895068394c9fdb251509c06a97235bf2..c22b6c16edbc4f09d4fd6275f1cf2ac872bac51d 100644 (file)
--- 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 c18a24a5633a5820d55a6e56934620c5223fb3de..f81352781def41b151166440d43f16be1febf8fa 100644 (file)
--- 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 7bfa67d35fcf764103375b153c1eb1845a35f8ee..05ee0341387b71d52f8c57abf41152139b82d9e2 100644 (file)
--- 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 14c2be54167196dfaac453275b4ade1681aff83d..fa5abc11fa9dabbc230f252b9c6b180554752e1c 100644 (file)
--- 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 f73287c31eda41151afdb639276383c2babae297..66f424749e99c96f99a0c97432ee54561200b7c1 100644 (file)
--- 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 b361ecaa1f9e5f61aa27fc18a88d1a3c9a40fb92..c33532dda33abfeef9d2315ac93e0df462e41a14 100644 (file)
--- 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 915d3c6787504c592133c541d023fdb403538d6b..33ccfe0e32d97a25a726b20d96286f202dd7da08 100644 (file)
--- 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 4074d629d92beb670202f6dbd8d763b38487cc04..fb9e3ae3c8462d8fd03f19b702f336c41d8f5e8d 100644 (file)
--- 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)
 
 #