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 2002/11/26 01:13:50 UTC
cvs commit: httpd-2.0/build NWGNUenvironment.inc
bnicholes 2002/11/25 16:13:50
Modified: modules/filters NWGNUmakefile NWGNUdeflate
build NWGNUenvironment.inc
Log:
Cleaning up the NetWare make files so that they detect and find the zlib
source correctly
Revision Changes Path
1.2 +3 -1 httpd-2.0/modules/filters/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 23 Nov 2002 00:32:01 -0000 1.1
+++ NWGNUmakefile 26 Nov 2002 00:13:50 -0000 1.2
@@ -156,9 +156,11 @@
$(EOLIST)
# If the zlib libraries source exists then build the mod_deflate module
-ifeq "$(wildcard $(AP_WORK)\srclib\zlib)" "$(AP_WORK)\srclib\zlib"
+ifneq "$(ZLIBSDK)" ""
+ifeq "$(wildcard $(ZLIBSDK))" "$(ZLIBSDK)"
TARGET_nlm += $(OBJDIR)/deflate.nlm \
$(EOLIST)
+endif
else
TARGET_nlm += $(OBJDIR)/extfiltr.nlm \
$(EOLIST)
1.5 +4 -4 httpd-2.0/modules/filters/NWGNUdeflate
Index: NWGNUdeflate
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUdeflate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NWGNUdeflate 16 Oct 2002 23:52:27 -0000 1.4
+++ NWGNUdeflate 26 Nov 2002 00:13:50 -0000 1.5
@@ -33,7 +33,6 @@
$(AP_WORK)/srclib/apr/include \
$(AP_WORK)/srclib/apr-util/include \
$(AP_WORK)/srclib/apr \
- $(AP_WORK)/srclib/zlib \
$(EOLIST)
#
@@ -265,10 +264,11 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../../srclib/zlib/%.c $(OBJDIR)\cc.opt
+ifneq "$(ZLIBSDK)" ""
+$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\cc.opt
@echo Compiling $<
- $(CC) ..\..\srclib\zlib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
+ $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+endif
#
# Include the 'tail' makefile that has targets that depend on variables defined
1.10 +8 -0 httpd-2.0/build/NWGNUenvironment.inc
Index: NWGNUenvironment.inc
===================================================================
RCS file: /home/cvs/httpd-2.0/build/NWGNUenvironment.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NWGNUenvironment.inc 16 Oct 2002 23:50:01 -0000 1.9
+++ NWGNUenvironment.inc 26 Nov 2002 00:13:50 -0000 1.10
@@ -44,6 +44,11 @@
# LDAPSDK = C:/novell/ndk/cldapsdk
# endif
+# This is a placeholder
+# ifndef ZLIBSDK
+# ZLIBSDK = C:/novell/ndk/zlibsdk
+# endif
+
ifndef METROWERKS
METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
endif
@@ -116,6 +121,9 @@
INCDIRS = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
ifneq "$(LDAPSDK)" ""
INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
+endif
+ifneq "$(ZLIBSDK)" ""
+INCDIRS := $(INCDIRS);$(ZLIBSDK)
endif
DEFINES = -DNETWARE