Commit 3f46d427 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Allow mod_deflate on NetWare to be compiled against zlib 1.2.1 

Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104141 13f79535-47bb-0310-9956-ffa450edef68
parent 2d258d1c

modules/filters/NWGNUdeflate

+9 −9
Changes for modules/filters/NWGNUdeflate: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ XINCDIRS += \ 
# These flags will come after CFLAGS

#

XCFLAGS		+= \

			-prefix pre_nw.h \

			$(EOLIST)



#
@@ -181,15 +180,20 @@ FILES_nlm_objs = \ 
	$(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 @@ install :: nlms FORCE 
# 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