From: Bradley Nicholes <bnicholes@apache.org>
Date: Mon, 31 Oct 2005 17:00:43 +0000 (+0000)
Subject: Minor make file changes to allow the clib prelude to be replaced
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9943820be90cf05cf9cce54b0546969029d7fa8;p=thirdparty%2Fapache%2Fhttpd.git

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 de3e3cccca3..9e9f3ad40d9 100644
--- 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 9128a88902a..3c9b9c889a0 100644
--- 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 b7652445618..45be7474e29 100644
--- 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 4256648dbbe..e066ae19525 100644
--- 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 ac5f62206e9..867ee5c199a 100644
--- 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 a8dc155e7e3..a9ba9c88433 100644
--- 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)
 
 #