You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2005/10/31 18:00:47 UTC
svn commit: r329856 - in /httpd/httpd/branches/1.3.x: NWGNUenvironment.inc
src/NWGNUmakefile.mak src/main/NWGNUmakefile.mak
src/modules/standard/NWGNUmakefile.mak src/support/NWGNUhtdigest.mak
src/support/NWGNUhtpasswd.mak
Author: bnicholes
Date: Mon Oct 31 09:00:43 2005
New Revision: 329856
URL: http://svn.apache.org/viewcvs?rev=329856&view=rev
Log:
Minor make file changes to allow the clib prelude to be replaced
Submitted by: Guenter Knauf
Modified:
httpd/httpd/branches/1.3.x/NWGNUenvironment.inc
httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak
httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak
httpd/httpd/branches/1.3.x/src/modules/standard/NWGNUmakefile.mak
httpd/httpd/branches/1.3.x/src/support/NWGNUhtdigest.mak
httpd/httpd/branches/1.3.x/src/support/NWGNUhtpasswd.mak
Modified: httpd/httpd/branches/1.3.x/NWGNUenvironment.inc
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/NWGNUenvironment.inc?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/1.3.x/NWGNUenvironment.inc Mon Oct 31 09:00:43 2005
@@ -113,6 +113,12 @@
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
Modified: httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak (original)
+++ httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak Mon Oct 31 09:00:43 2005
@@ -166,7 +166,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- clibpre.o \
+ $(CLIB_PRELUDE) \
$(EOLIST)
#
Modified: httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak (original)
+++ httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak Mon Oct 31 09:00:43 2005
@@ -180,7 +180,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- clibpre.o \
+ $(CLIB_PRELUDE) \
$(APLIB) \
$(REGEXLIB) \
$(STDMODLIB) \
Modified: httpd/httpd/branches/1.3.x/src/modules/standard/NWGNUmakefile.mak
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/modules/standard/NWGNUmakefile.mak?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/modules/standard/NWGNUmakefile.mak (original)
+++ httpd/httpd/branches/1.3.x/src/modules/standard/NWGNUmakefile.mak Mon Oct 31 09:00:43 2005
@@ -143,13 +143,13 @@
$(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)
Modified: httpd/httpd/branches/1.3.x/src/support/NWGNUhtdigest.mak
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/support/NWGNUhtdigest.mak?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/support/NWGNUhtdigest.mak (original)
+++ httpd/httpd/branches/1.3.x/src/support/NWGNUhtdigest.mak Mon Oct 31 09:00:43 2005
@@ -163,9 +163,9 @@
# 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.
Modified: httpd/httpd/branches/1.3.x/src/support/NWGNUhtpasswd.mak
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/support/NWGNUhtpasswd.mak?rev=329856&r1=329855&r2=329856&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/support/NWGNUhtpasswd.mak (original)
+++ httpd/httpd/branches/1.3.x/src/support/NWGNUhtpasswd.mak Mon Oct 31 09:00:43 2005
@@ -167,7 +167,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- clibpre.o \
+ $(CLIB_PRELUDE) \
$(EOLIST)
#