diff options
| -rw-r--r-- | NWGNUmakefile | 2 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 1 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdfreetds | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdmysql | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdpgsql | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli2 | 2 | ||||
| -rw-r--r-- | dbd/NWGNUdbdsqli3 | 2 | ||||
| -rw-r--r-- | dbm/NWGNUdbmdb | 2 | ||||
| -rw-r--r-- | dbm/NWGNUdbmgdbm | 2 | ||||
| -rw-r--r-- | test/NWGNUaprtest | 2 | ||||
| -rw-r--r-- | test/NWGNUechod | 2 | ||||
| -rw-r--r-- | test/NWGNUglobalmutexchild | 2 | ||||
| -rw-r--r-- | test/NWGNUmod_test | 2 | ||||
| -rw-r--r-- | test/NWGNUproc_child | 2 | ||||
| -rw-r--r-- | test/NWGNUreadchild | 2 | ||||
| -rw-r--r-- | test/NWGNUsockchild | 2 | ||||
| -rw-r--r-- | test/NWGNUsockperf | 2 | ||||
| -rw-r--r-- | test/NWGNUtestatmc | 2 | ||||
| -rw-r--r-- | test/NWGNUtryread | 2 |
20 files changed, 19 insertions, 20 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 2f3c4b3eb..4c96325e1 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -202,7 +202,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(APRLIB) \ $(APRLDAPLIB) \ $(APRXMLLIB) \ diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 1d933f392..05cd6b5ee 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -180,6 +180,7 @@ endif endif NOVI = $(NOVELLLIBC)/imports +PRELUDE = $(NOVI)/libcpre.o INCDIRS = $(NOVELLLIBC)/include; diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 06c2507f9..760369155 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -247,8 +247,6 @@ endif # Rules to build nlms. # -vpath libcpre.o $(NOVELLLIBC)/imports - # If we only have one target NLM then build it ifeq "$(words $(strip $(TARGET_nlm)))" "1" diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds index 393e380c5..8692ff3bc 100644 --- a/dbd/NWGNUdbdfreetds +++ b/dbd/NWGNUdbdfreetds @@ -193,7 +193,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql index 72bb414e2..c3e9c811f 100644 --- a/dbd/NWGNUdbdmysql +++ b/dbd/NWGNUdbdmysql @@ -197,7 +197,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql index f6848fa96..05e67bcb0 100644 --- a/dbd/NWGNUdbdpgsql +++ b/dbd/NWGNUdbdpgsql @@ -200,7 +200,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2 index c1f9cd1fa..3caef7a48 100644 --- a/dbd/NWGNUdbdsqli2 +++ b/dbd/NWGNUdbdsqli2 @@ -193,7 +193,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3 index ed52a2486..e66f2347e 100644 --- a/dbd/NWGNUdbdsqli3 +++ b/dbd/NWGNUdbdsqli3 @@ -193,7 +193,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbm/NWGNUdbmdb b/dbm/NWGNUdbmdb index fdce7b4f0..a79edf087 100644 --- a/dbm/NWGNUdbmdb +++ b/dbm/NWGNUdbmdb @@ -201,7 +201,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/dbm/NWGNUdbmgdbm b/dbm/NWGNUdbmgdbm index 3ab1c815c..dc0c2b0eb 100644 --- a/dbm/NWGNUdbmgdbm +++ b/dbm/NWGNUdbmgdbm @@ -200,7 +200,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) ifeq ($(LINK_STATIC),1) diff --git a/test/NWGNUaprtest b/test/NWGNUaprtest index 42ba72ae6..6b6ac26c5 100644 --- a/test/NWGNUaprtest +++ b/test/NWGNUaprtest @@ -247,7 +247,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/test/NWGNUechod b/test/NWGNUechod index 3984d7712..54280b145 100644 --- a/test/NWGNUechod +++ b/test/NWGNUechod @@ -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/test/NWGNUglobalmutexchild b/test/NWGNUglobalmutexchild index 8fbb187bc..fef38fe6c 100644 --- a/test/NWGNUglobalmutexchild +++ b/test/NWGNUglobalmutexchild @@ -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/test/NWGNUmod_test b/test/NWGNUmod_test index 102781b76..97bdfcd24 100644 --- a/test/NWGNUmod_test +++ b/test/NWGNUmod_test @@ -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/test/NWGNUproc_child b/test/NWGNUproc_child index fd7aa47f7..05438aa1a 100644 --- a/test/NWGNUproc_child +++ b/test/NWGNUproc_child @@ -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/test/NWGNUreadchild b/test/NWGNUreadchild index 3ec701270..f1836b8f5 100644 --- a/test/NWGNUreadchild +++ b/test/NWGNUreadchild @@ -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/test/NWGNUsockchild b/test/NWGNUsockchild index 319eefa8e..618ad4760 100644 --- a/test/NWGNUsockchild +++ b/test/NWGNUsockchild @@ -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/test/NWGNUsockperf b/test/NWGNUsockperf index d846d9845..ea3a55679 100644 --- a/test/NWGNUsockperf +++ b/test/NWGNUsockperf @@ -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/test/NWGNUtestatmc b/test/NWGNUtestatmc index f851ef781..8bb47602f 100644 --- a/test/NWGNUtestatmc +++ b/test/NWGNUtestatmc @@ -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/test/NWGNUtryread b/test/NWGNUtryread index 92b2a6e3e..e6c3eee5d 100644 --- a/test/NWGNUtryread +++ b/test/NWGNUtryread @@ -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) # |