httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/modules/filters NWGNUdeflate
Date Wed, 30 Jun 2004 16:27:55 GMT
bnicholes    2004/06/30 09:27:55

  Modified:    modules/filters NWGNUdeflate
  Log:
  Allow mod_deflate on NetWare to be compiled against zlib 1.2.1
  
  Submitted by: Guenter Knauf <fuankg@apache.org>
  
  Revision  Changes    Path
  1.7       +16 -16    httpd-2.0/modules/filters/NWGNUdeflate
  
  Index: NWGNUdeflate
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUdeflate,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NWGNUdeflate	7 Mar 2004 03:04:51 -0000	1.6
  +++ NWGNUdeflate	30 Jun 2004 16:27:55 -0000	1.7
  @@ -39,7 +39,6 @@
   # These flags will come after CFLAGS
   #
   XCFLAGS		+= \
  -			-prefix pre_nw.h \
   			$(EOLIST)
   
   #
  @@ -69,7 +68,7 @@
   			$(EOLIST)
   
   XLFLAGS		+= \
  -		   	$(EOLIST)
  +			$(EOLIST)
   endif
   
   ifeq "$(RELEASE)" "noopt"
  @@ -83,7 +82,7 @@
   			$(EOLIST)
   
   XLFLAGS		+= \
  -		   	$(EOLIST)
  +			$(EOLIST)
   endif
   
   ifeq "$(RELEASE)" "release"
  @@ -123,7 +122,7 @@
   # If this is specified, it will override VERSION value in
   # $(AP_WORK)\build\NWGNUenvironment.inc
   #
  -NLM_VERSION		=
  +NLM_VERSION	=
   
   #
   # If this is specified, it will override the default of 64K
  @@ -149,14 +148,14 @@
   #
   # If these are specified it will be used by the link '-flags' directive
   #
  -NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
  +NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
   
   #
   # If this is specified it will be linked in with the XDCData option in the def
   # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
   # by setting APACHE_UNIPROC in the environment
   #
  -XDCDATA         =
  +XDCDATA		=
   
   #
   # If there is an NLM target, put it here
  @@ -181,21 +180,26 @@
   	$(OBJDIR)/crc32.o \
   	$(OBJDIR)/deflate.o \
   	$(OBJDIR)/inflate.o \
  -	$(OBJDIR)/infblock.o \
  -	$(OBJDIR)/infcodes.o \
   	$(OBJDIR)/inffast.o \
   	$(OBJDIR)/inftrees.o \
  -	$(OBJDIR)/infutil.o \
   	$(OBJDIR)/trees.o \
   	$(OBJDIR)/zutil.o \
   	$(EOLIST)
   
  +ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
  +FILES_nlm_objs += \
  +	$(OBJDIR)/infblock.o \
  +	$(OBJDIR)/infcodes.o \
  +	$(OBJDIR)/infutil.o \
  +	$(EOLIST)
  +endif
  +
   #
   # These are the LIB files needed to create the NLM target above.
   # These will be added as a library command in the link.opt file.
   #
   FILES_nlm_libs = \
  -   	libcpre.o \
  +	libcpre.o \
   	$(EOLIST)
   
   #
  @@ -243,7 +247,7 @@
   # Paths must all use the '/' character
   #
   FILES_lib_objs = \
  -		$(EOLIST)
  +	$(EOLIST)
   
   #
   # implement targets and dependancies (leave this section alone)
  @@ -264,11 +268,7 @@
   # Any specialized rules here
   #
   
  -ifneq "$(ZLIBSDK)" ""
  -$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
  -	@echo Compiling $<
  -	$(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
  -endif
  +vpath %.c $(ZLIBSDK)
   
   #
   # Include the 'tail' makefile that has targets that depend on variables defined
  
  
  

Mime
View raw message