Author: fuankg
Date: Tue Dec 1 22:29:42 2009
New Revision: 885976
URL: http://svn.apache.org/viewvc?rev=885976&view=rev
Log:
fixed NetWare makefiles for newer pcre.
Modified:
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/NWGNUenvironment.inc
httpd/httpd/trunk/build/NWGNUmakefile
httpd/httpd/trunk/build/NWGNUtail.inc
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=885976&r1=885975&r2=885976&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Tue Dec 1 22:29:42 2009
@@ -80,6 +80,7 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
+ -DHAVE_CONFIG_H \
$(EOLIST)
#
@@ -216,6 +217,7 @@
# If there is an LIB target, put it here
#
TARGET_lib = \
+ $(OBJDIR)/pcre.lib \
$(EOLIST)
#
@@ -258,7 +260,6 @@
$(OBJDIR)/modules.o \
$(OBJDIR)/mpm_common.o \
$(OBJDIR)/mpm_netware.o \
- $(OBJDIR)/pcre.o \
$(OBJDIR)/protocol.o \
$(OBJDIR)/provider.o \
$(OBJDIR)/request.o \
@@ -291,6 +292,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
+ $(PCRELIB) \
libcpre.o \
$(EOLIST)
@@ -345,9 +347,29 @@
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
+ifeq "$(wildcard $(PCRE)/pcre.c)" "$(PCRE)/pcre.c"
+
FILES_lib_objs = \
+ $(OBJDIR)/pcre.o \
$(EOLIST)
+else
+
+FILES_lib_objs = \
+ $(OBJDIR)/pcre_compile.o \
+ $(OBJDIR)/pcre_exec.o \
+ $(OBJDIR)/pcre_fullinfo.o \
+ $(OBJDIR)/pcre_globals.o \
+ $(OBJDIR)/pcre_info.o \
+ $(OBJDIR)/pcre_newline.o \
+ $(OBJDIR)/pcre_tables.o \
+ $(OBJDIR)/pcre_try_flipped.o \
+ $(OBJDIR)/pcre_version.o \
+ $(OBJDIR)/chartables.o \
+ $(EOLIST)
+
+endif
+
#
# implement targets and dependancies (leave this section alone)
#
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=885976&r1=885975&r2=885976&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Tue Dec 1 22:29:42 2009
@@ -50,11 +50,11 @@
endif
ifndef PCRESRC
-ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre.in)" "$(AP_WORK)/srclib/pcre/pcre.in"
+ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre-config.in)" "$(AP_WORK)/srclib/pcre/pcre-config.in"
PCRESRC = $(AP_WORK)/srclib/pcre
endif
endif
-ifneq "$(wildcard $(PCRESRC)/pcre.in)" "$(PCRESRC)/pcre.in"
+ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in"
$(error PCRESRC does not point to a valid PCRE source tree)
endif
@@ -344,7 +344,7 @@
APRUTLIB = $(APRUTIL)/$(OBJDIR)/aprutil.lib
APULDAPLIB = $(APULDAP)/$(OBJDIR)/apuldap.lib
STMODLIB = $(STDMOD)/$(OBJDIR)/stdmod.lib
-PCRELIB = $(PCRE)/$(OBJDIR)/pcre.lib
+PCRELIB = $(SRC)/$(OBJDIR)/pcre.lib
NWOSLIB = $(NWOS)/$(OBJDIR)/netware.lib
SERVLIB = $(SERVER)/$(OBJDIR)/server.lib
HTTPDLIB = $(HTTPD)/$(OBJDIR)/httpd.lib
Modified: httpd/httpd/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUmakefile?rev=885976&r1=885975&r2=885976&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Tue Dec 1 22:29:42 2009
@@ -3,7 +3,7 @@
#
SUBDIRS = \
- $(APR_WORK)\build \
+ $(APR_WORK)/build \
$(EOLIST)
#
@@ -11,7 +11,7 @@
# paths to tools
#
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -50,6 +50,10 @@
@echo -I$(APRUTIL)\include >> $@
@echo -ir $(NOVELLLIBC) >> $@
+$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.h.generic
+ @echo Creating $(subst /,\,$@)
+ copy $< $(subst /,\,$(PCRE))\$(@F)
+
$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
@echo Creating $(subst /,\,$@)
copy $< $(subst /,\,$(PCRE))\$(@F)
@@ -62,7 +66,7 @@
%.exe: $(PCRE)/%.c
@echo Creating Build Helper $@
- @$(WIN_CC) $(WIN_CFLAGS) $< -o $@
+ @$(WIN_CC) $(WIN_CFLAGS) -DHAVE_CONFIG_H $< -o $@
$(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
@echo Creating $(subst /,\,$@)
@@ -116,5 +120,5 @@
# in this makefile
#
-include $(AP_WORK)\build\NWGNUtail.inc
+include $(AP_WORK)/build/NWGNUtail.inc
Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=885976&r1=885975&r2=885976&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Tue Dec 1 22:29:42 2009
@@ -237,6 +237,7 @@
endif
@echo -l $(APULDAP)/$(OBJDIR) >> $@
@echo -l $(XML)/$(OBJDIR) >> $@
+ @echo -l $(SRC)/$(OBJDIR) >> $@
@echo -nodefaults >> $@
@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
ifneq "$(strip $(XLFLAGS))" ""
|