Fixed install target; prepared for external PCRE.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087537 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index ecba7eaa4ce60e87106ea87b3472b12664479c83..4e30e2cb5f4892b1a252ab54ca903fcce7bbc332 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -213,6 +213,7 @@ TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
+       $(PCRELIB) \
        $(EOLIST)
 
 #
@@ -251,7 +252,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 \
@@ -281,6 +281,7 @@ endif
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
+       $(PCRELIB) \
        $(PRELUDE) \
        $(EOLIST)
 
@@ -335,9 +336,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)
 #
@@ -350,56 +371,72 @@ nlms :: libs $(TARGET_nlm)
 # Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
+MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
+
 install :: nlms instscripts FORCE
-       -copy $(OBJDIR)\$(NLM_NAME).nlm  $(INSTALL)\$(BASEDIR)\*.*
-       -copy ABOUT_APACHE               $(INSTALL)\$(BASEDIR)\*.*
-       -copy CHANGES                    $(INSTALL)\$(BASEDIR)\*.*
-       -copy LICENSE                    $(INSTALL)\$(BASEDIR)\*.*
-       -copy README                     $(INSTALL)\$(BASEDIR)\*.*
-       -copy VERSIONING                 $(INSTALL)\$(BASEDIR)\*.*
-       -copy STATUS                     $(INSTALL)\$(BASEDIR)\*.*
-       -copy support\dbmmanage.in       $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl
-       -copy support\logresolve.pl.in   $(INSTALL)\$(BASEDIR)\bin\logresolve.pl
-       -copy support\split-logfile.in   $(INSTALL)\$(BASEDIR)\bin\split-logfile.pl
-       -copy support\check_forensic     $(INSTALL)\$(BASEDIR)\bin\check_forensic.sh
-       -copy docs\conf\magic            $(INSTALL)\$(BASEDIR)\conf\magic
-       -copy docs\conf\mime.types       $(INSTALL)\$(BASEDIR)\conf\mime.types
-       -copy docs\conf\charset.conv     $(INSTALL)\$(BASEDIR)\conf\charset.conv
-       -copy docs\cgi-examples\printenv $(INSTALL)\$(BASEDIR)\cgi-bin\printenv.pl
-       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-       $(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-autoindex.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-dav.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-default.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-info.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-languages.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-manual.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-mpm.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-multilang-errordoc.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf
-       -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf
-       @xcopy $(XCOPYSW) docs\error     $(INSTALL)\$(BASEDIR)\error
-       @xcopy $(XCOPYSW) docs\docroot   $(INSTALL)\$(BASEDIR)\htdocs
-       @xcopy $(XCOPYSW) docs\icons     $(INSTALL)\$(BASEDIR)\icons
-       @xcopy $(XCOPYSW) docs\man       $(INSTALL)\$(BASEDIR)\man
-       @xcopy $(XCOPYSW) docs\manual    $(INSTALL)\$(BASEDIR)\manual
+       $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,                         $(INSTALLBASE)/)
+       $(call COPY,ABOUT_APACHE,                                      $(INSTALLBASE)/)
+       $(call COPY,CHANGES,                                           $(INSTALLBASE)/)
+       $(call COPY,LICENSE,                                           $(INSTALLBASE)/)
+       $(call COPY,README,                                            $(INSTALLBASE)/)
+       $(call COPY,VERSIONING,                                        $(INSTALLBASE)/)
+       $(call COPY,STATUS,                                            $(INSTALLBASE)/)
+       $(call COPY,support/dbmmanage.in,                              $(INSTALLBASE)/bin/dbmmanage.pl)
+       $(call COPY,support/logresolve.pl.in,                          $(INSTALLBASE)/bin/logresolve.pl)
+       $(call COPY,support/split-logfile.in,                          $(INSTALLBASE)/bin/split-logfile.pl)
+       $(call COPY,support/check_forensic,                            $(INSTALLBASE)/bin/check_forensic.sh)
+       $(call COPY,docs/conf/magic,                                   $(INSTALLBASE)/conf/)
+       $(call COPY,docs/conf/mime.types,                              $(INSTALLBASE)/conf/)
+       $(call COPY,docs/conf/charset.conv,                            $(INSTALLBASE)/conf/)
+       $(call COPY,docs/cgi-examples/printenv,                        $(INSTALLBASE)/cgi-bin/printenv.pl)
+       $(call MKCNF,docs/conf/httpd.conf.in,                          $(INSTALLBASE)/conf/httpd.conf)
+       $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in,          $(INSTALLBASE)/conf/extra/httpd-autoindex.conf)
+       $(call MKCNF,docs/conf/extra/httpd-dav.conf.in,                $(INSTALLBASE)/conf/extra/httpd-dav.conf)
+       $(call MKCNF,docs/conf/extra/httpd-default.conf.in,            $(INSTALLBASE)/conf/extra/httpd-default.conf)
+       $(call MKCNF,docs/conf/extra/httpd-info.conf.in,               $(INSTALLBASE)/conf/extra/httpd-info.conf)
+       $(call MKCNF,docs/conf/extra/httpd-languages.conf.in,          $(INSTALLBASE)/conf/extra/httpd-languages.conf)
+       $(call MKCNF,docs/conf/extra/httpd-manual.conf.in,             $(INSTALLBASE)/conf/extra/httpd-manual.conf)
+       $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in,                $(INSTALLBASE)/conf/extra/httpd-mpm.conf)
+       $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf)
+       $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in,            $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
+       $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in,             $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
+       $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in,                $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
+       $(call COPYR,docs/docroot,                                     $(INSTALLBASE)/htdocs)
+       $(call COPYR,docs/error,                                       $(INSTALLBASE)/error)
+       $(call COPYR,docs/icons,                                       $(INSTALLBASE)/icons)
+       $(call COPYR,docs/man,                                         $(INSTALLBASE)/man)
+       $(call COPYR,docs/manual,                                      $(INSTALLBASE)/manual)
 
 installdev :: FORCE
-       -copy $(subst /,\,$(AP_WORK))\include\*.h  $(INSTALL)\$(BASEDIR)\include\*.*
-       -copy $(subst /,\,$(NWOS))\*.h             $(INSTALL)\$(BASEDIR)\include\*.*
-       -copy $(subst /,\,$(APR))\include\*.h      $(INSTALL)\$(BASEDIR)\include\*.*
-       -copy $(subst /,\,$(APRUTIL))\include\*.h  $(INSTALL)\$(BASEDIR)\include\*.*
-       -copy $(subst /,\,$(APR))\*.imp            $(INSTALL)\$(BASEDIR)\lib\*.*
-       -copy $(subst /,\,$(NWOS))\*.imp           $(INSTALL)\$(BASEDIR)\lib\*.*
-       -copy $(subst /,\,$(NWOS))\*.xdc           $(INSTALL)\$(BASEDIR)\lib\*.*
+       $(call COPY,$(SRC)/include/*.h,                                $(INSTALLBASE)/include/)
+       $(call COPY,$(NWOS)/*.h,                                       $(INSTALLBASE)/include/)
+       $(call COPY,$(APR)/include/*.h,                                $(INSTALLBASE)/include/)
+       $(call COPY,$(APRUTIL)/include/*.h,                            $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/core/mod_so.h,                           $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/cache/mod_cache.h,                       $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/database/mod_dbd.h,                      $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/dav/main/mod_dav.h,                      $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/filters/mod_include.h,                   $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/generators/mod_cgi.h,                    $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/generators/mod_status.h,                 $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/loggers/mod_log_config.h,                $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/mappers/mod_rewrite.h,                   $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
+       $(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)
+       $(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)
+       $(call COPY,$(NWOS)/*.xdc,                                     $(INSTALLBASE)/lib/)
+       $(call COPY,$(APBUILD)/NWGNU*.inc,                             $(INSTALLBASE)/build/)
 
 prebuild :: FORCE
-       $(MAKE) -C server -f NWGNUmakefile
-       $(MAKE) -C srclib/pcre -f NWGNUmakefile
-       $(CHKNOT) $(PREBUILD_INST)\nul          mkdir $(PREBUILD_INST)
-       -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
-       -copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+       $(MAKE) -C $(SERVER) -f NWGNUmakefile
+       $(MAKE) -C $(PCRE) -f NWGNUmakefile
+       $(call MKDIR,$(PREBUILD_INST))
+       $(call COPY,$(SERVER)/$(OBJDIR)/*.nlm,                         $(PREBUILD_INST)/)
+       $(call COPY,$(PCRE)/$(OBJDIR)/*.nlm,                           $(PREBUILD_INST)/)
 
 #
 # Any specialized rules here