Minor make file changes to allow the clib prelude to be replaced

Submitted by: Guenter Knauf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@329856 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUenvironment.inc b/NWGNUenvironment.inc
index de3e3cccca34bb8c25503a252c3e0a02c7c8da02..9e9f3ad40d9159e765838240553cf7e31c3b08de 100644 (file)
--- a/NWGNUenvironment.inc
+++ b/NWGNUenvironment.inc
@@ -113,6 +113,12 @@ LIB                = mwldnlm -type library -w nocmdline
 NOVI   = $(NWSDKDIR)\imports
 
 INCDIRS        = $(NWSDKDIR)\include\nlm;$(NWSDKDIR)\include;$(NWSDKDIR)\include\winsock
+ifdef WS295SDK
+       INCDIRS += ;$(WS295SDK)\include
+endif
+ifndef CLIB_PRELUDE
+       CLIB_PRELUDE = clibpre.o
+endif
 
 DEFINES                = -DNETWARE
 

diff --git a/src/NWGNUmakefile.mak b/src/NWGNUmakefile.mak
index 9128a88902a55a66d85861db2047973cb7173d4d..3c9b9c889a02b11d66ad4384b836151c4422aaa2 100644 (file)
--- a/src/NWGNUmakefile.mak
+++ b/src/NWGNUmakefile.mak
@@ -166,7 +166,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       clibpre.o \
+       $(CLIB_PRELUDE) \
        $(EOLIST)
 
 #

diff --git a/src/main/NWGNUmakefile.mak b/src/main/NWGNUmakefile.mak
index b765244561888da2bf6417fa95975be3bbb15ad4..45be7474e299de233186f6de1c47e478154613a8 100644 (file)
--- a/src/main/NWGNUmakefile.mak
+++ b/src/main/NWGNUmakefile.mak
@@ -180,7 +180,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       clibpre.o \
+       $(CLIB_PRELUDE) \
        $(APLIB) \
        $(REGEXLIB) \
        $(STDMODLIB) \

diff --git a/src/modules/standard/NWGNUmakefile.mak b/src/modules/standard/NWGNUmakefile.mak
index 4256648dbbe6fccd271184d25a430d3cfe079fbb..e066ae19525b21a282f105ba874c374ca2eb75b2 100644 (file)
--- a/src/modules/standard/NWGNUmakefile.mak
+++ b/src/modules/standard/NWGNUmakefile.mak
@@ -143,13 +143,13 @@ TARGET_nlm = \
        $(OBJDIR)/CERNMeta.nlm \
        $(OBJDIR)/Digest.nlm \
        $(OBJDIR)/Expires.nlm \
-       $(OBJDIR)/Forensic.nlm \
+       $(OBJDIR)/forensic.nlm \
        $(OBJDIR)/Headers.nlm \
        $(OBJDIR)/Info.nlm \
        $(OBJDIR)/Rewrite.nlm \
        $(OBJDIR)/Speling.nlm \
        $(OBJDIR)/Status.nlm \
-       $(OBJDIR)/Uniqueid.nlm \
+       $(OBJDIR)/uniqueid.nlm \
        $(OBJDIR)/Usrtrack.nlm \
        $(OBJDIR)/Vhost.nlm \
        $(EOLIST)

diff --git a/src/support/NWGNUhtdigest.mak b/src/support/NWGNUhtdigest.mak
index ac5f62206e9a4e213007295ce184d79eb72d7d21..867ee5c199a37db46a0b56f24900b7d35617ed29 100644 (file)
--- a/src/support/NWGNUhtdigest.mak
+++ b/src/support/NWGNUhtdigest.mak
@@ -163,9 +163,9 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       clibpre.o \
+       $(CLIB_PRELUDE) \
        $(EOLIST)
-       
+
 #
 # These are the modules that the above NLM target depends on to load.
 # These will be added as a module command in the link.opt file.

diff --git a/src/support/NWGNUhtpasswd.mak b/src/support/NWGNUhtpasswd.mak
index a8dc155e7e3c8f806d38520870140fa9f314f231..a9ba9c88433345c400ce9ac47c07aea1d7bbbd00 100644 (file)
--- a/src/support/NWGNUhtpasswd.mak
+++ b/src/support/NWGNUhtpasswd.mak
@@ -167,7 +167,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       clibpre.o \
+       $(CLIB_PRELUDE) \
        $(EOLIST)
 
 #