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 Fri, 02 Jul 2004 18:58:28 GMT
bnicholes    2004/07/02 11:58:28

  Modified:    modules/filters Tag: APACHE_2_0_BRANCH 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
  No                   revision
  No                   revision
  1.4.2.3   +9 -9      httpd-2.0/modules/filters/NWGNUdeflate
  
  Index: NWGNUdeflate
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/NWGNUdeflate,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- NWGNUdeflate	12 Apr 2004 20:50:54 -0000	1.4.2.2
  +++ NWGNUdeflate	2 Jul 2004 18:58:28 -0000	1.4.2.3
  @@ -39,7 +39,6 @@
   # These flags will come after CFLAGS
   #
   XCFLAGS		+= \
  -			-prefix pre_nw.h \
   			$(EOLIST)
   
   #
  @@ -181,15 +180,20 @@
   	$(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.
  @@ -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