diff options
| author | Guenter Knauf <fuankg@apache.org> | 2009-12-01 23:29:42 +0100 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2009-12-01 23:29:42 +0100 |
| commit | 2526397ab9d3f7525d316ba61f09160b5a295dc1 (patch) | |
| tree | abbe50b25c28901f23f937dedb3957e76e0f975a /NWGNUmakefile | |
| parent | include definition of cmd_parms (diff) | |
| download | apache2-2526397ab9d3f7525d316ba61f09160b5a295dc1.tar.xz apache2-2526397ab9d3f7525d316ba61f09160b5a295dc1.zip | |
fixed NetWare makefiles for newer pcre.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885976 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 523f85a0b9..9f59a9d9b7 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -80,6 +80,7 @@ XINCDIRS += \ # These flags will come after CFLAGS # XCFLAGS += \ + -DHAVE_CONFIG_H \ $(EOLIST) # @@ -216,6 +217,7 @@ TARGET_nlm = \ # If there is an LIB target, put it here # TARGET_lib = \ + $(OBJDIR)/pcre.lib \ $(EOLIST) # @@ -258,7 +260,6 @@ FILES_nlm_objs = \ $(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 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ + $(PCRELIB) \ libcpre.o \ $(EOLIST) @@ -345,9 +347,29 @@ FILES_nlm_exports = \ # 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) # |