X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=NWGNUmakefile;h=9347fac79af831619a584342d18890eb0137f949;hb=230e36996587df016c14fe14ac6df4f32a671e66;hp=3ae56b9dd98e84a9b8d07f55bb800bc9b0222788;hpb=6905d3d9d5da41176e547742c8c04d434cde2056;p=apache diff --git a/NWGNUmakefile b/NWGNUmakefile index 3ae56b9dd9..9347fac79a 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -1,3 +1,34 @@ +# +# Define our required macro's if not already done. +# + +ifndef AP_WORK +export AP_WORK = $(CURDIR) +endif + +ifndef APR_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr" +export APR_WORK = $(AP_WORK)/srclib/apr +endif +endif +ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h" +$(error APR_WORK does not point to a valid APR source tree) +endif + +ifndef APU_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util" +export APU_WORK = $(AP_WORK)/srclib/apr-util +endif +endif +ifndef APU_WORK +ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h" +export APU_WORK = $(APR_WORK) +endif +endif +ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h" +$(error APU_WORK does not point to a valid APU source tree) +endif + # # Declare the sub-directories to be built here # @@ -7,7 +38,7 @@ SUBDIRS = \ build \ support \ modules \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -31,15 +62,17 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ + $(AP_WORK)/modules/aaa/ \ + $(AP_WORK)/modules/core \ $(AP_WORK)/modules/filters/ \ $(AP_WORK)/modules/generators/ \ $(AP_WORK)/modules/http/ \ $(AP_WORK)/modules/loggers/ \ $(AP_WORK)/modules/mappers/ \ $(AP_WORK)/modules/proxy/ \ - $(AP_WORK)/os/NetWare \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ + $(AP_WORK)/modules/ssl/ \ + $(AP_WORK)/server/mpm/netware \ + $(PCRE) \ $(NWOS) \ $(EOLIST) @@ -47,6 +80,7 @@ XINCDIRS += \ # These flags will come after CFLAGS # XCFLAGS += \ + -DHAVE_CONFIG_H \ $(EOLIST) # @@ -76,7 +110,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -90,7 +124,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -112,13 +146,13 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = Apache2 +NLM_NAME = Apache2 # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # -NLM_DESCRIPTION = Apache Web Server $(VERSION_STR) +NLM_DESCRIPTION = Apache Web Server $(VERSION_STR) $(VERSION_SKT) # # This is used by the '-threadname' directive. If left blank, @@ -134,16 +168,16 @@ NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -163,14 +197,14 @@ NLM_CHECK_SYM = _LibCCheckUnload # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = PSEUDOPREEMPTION +NLM_FLAGS = PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -183,6 +217,7 @@ TARGET_nlm = \ # If there is an LIB target, put it here # TARGET_lib = \ + $(OBJDIR)/pcre.lib \ $(EOLIST) # @@ -196,6 +231,7 @@ FILES_nlm_objs = \ $(OBJDIR)/core.o \ $(OBJDIR)/core_filters.o \ $(OBJDIR)/eoc_bucket.o \ + $(OBJDIR)/eor_bucket.o \ $(OBJDIR)/error_bucket.o \ $(OBJDIR)/http_core.o \ $(OBJDIR)/http_protocol.o \ @@ -207,6 +243,8 @@ FILES_nlm_objs = \ $(OBJDIR)/listen.o \ $(OBJDIR)/log.o \ $(OBJDIR)/main.o \ + $(OBJDIR)/mod_authn_core.o \ + $(OBJDIR)/mod_authz_core.o \ $(OBJDIR)/mod_authz_host.o \ $(OBJDIR)/mod_alias.o \ $(OBJDIR)/mod_dir.o \ @@ -218,10 +256,10 @@ FILES_nlm_objs = \ $(OBJDIR)/mod_netware.o \ $(OBJDIR)/mod_setenvif.o \ $(OBJDIR)/mod_so.o \ + $(OBJDIR)/mod_watchdog.o \ $(OBJDIR)/modules.o \ $(OBJDIR)/mpm_common.o \ $(OBJDIR)/mpm_netware.o \ - $(OBJDIR)/pcre.o \ $(OBJDIR)/protocol.o \ $(OBJDIR)/provider.o \ $(OBJDIR)/request.o \ @@ -229,11 +267,15 @@ FILES_nlm_objs = \ $(OBJDIR)/util.o \ $(OBJDIR)/util_cfgtree.o \ $(OBJDIR)/util_charset.o \ + $(OBJDIR)/util_cookies.o \ $(OBJDIR)/util_debug.o \ + $(OBJDIR)/util_expr.o \ $(OBJDIR)/util_filter.o \ $(OBJDIR)/util_md5.o \ + $(OBJDIR)/util_mutex.o \ $(OBJDIR)/util_nw.o \ $(OBJDIR)/util_pcre.o \ + $(OBJDIR)/util_regex.o \ $(OBJDIR)/util_script.o \ $(OBJDIR)/util_time.o \ $(OBJDIR)/util_xml.o \ @@ -243,7 +285,7 @@ FILES_nlm_objs = \ # Build in mod_nw_ssl if Winsock is being used ifndef USE_STDSOCKETS FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \ - $(EOLIST) + $(EOLIST) endif # @@ -251,7 +293,8 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PCRELIB) \ + libcpre.o \ $(EOLIST) # @@ -267,7 +310,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -288,25 +331,48 @@ FILES_nlm_Ximports = \ GetCurrentAddressSpace \ $(EOLIST) -# Build in mod_nw_ssl if Winsock is being used +# Don't link with Winsock if standard sockets are being used ifndef USE_STDSOCKETS FILES_nlm_Ximports += @ws2nlm.imp \ - $(EOLIST) + $(EOLIST) endif - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ @$(NWOS)/httpd.imp \ $(EOLIST) - -# + +# # 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 = \ - $(EOLIST) + $(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 \ + $(EOLIST) + +endif + +FILES_lib_objs += \ + $(OBJDIR)/chartables.o \ + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -317,64 +383,58 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # -install :: nlms FORCE - -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\Apache2\*.* - -copy ABOUT_APACHE $(INSTALL)\Apache2\*.* - -copy README $(INSTALL)\Apache2\*.* - -copy STATUS $(INSTALL)\Apache2\*.* - -copy LICENSE $(INSTALL)\Apache2\*.* - -copy CHANGES $(INSTALL)\Apache2\*.* - -copy support\dbmmanage.in $(INSTALL)\Apache2\bin\dbmmanage.pl - -copy support\logresolve.pl.in $(INSTALL)\Apache2\bin\logresolve.pl - -awk -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf - $(CHKNOT) $(INSTALL)\Apache2\conf\extra\nul mkdir $(INSTALL)\Apache2\conf\extra - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-autoindex.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-dav.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-default.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-info.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-languages.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-manual.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-mpm.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-multilang-errordoc.conf - -awk -v SSL=1 -f build\mkconfnw.awk $(INSTALL)\Apache2\conf\extra\httpd-ssl.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-userdir.conf - -awk -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-vhosts.conf - -copy docs\conf\magic $(INSTALL)\Apache2\conf\magic - -copy docs\conf\mime.types $(INSTALL)\Apache2\conf\mime.types - -copy docs\conf\charset.conv $(INSTALL)\Apache2\conf\charset.conv - -copy docs\cgi-examples\printenv $(INSTALL)\Apache2\cgi-bin\printenv.pl - @echo rem copying the docs directories > xc.bat - @echo xcopy docs\error $(INSTALL)\Apache2\error $(XCOPYSW) >> xc.bat - @echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs $(XCOPYSW) >> xc.bat - @echo xcopy docs\icons $(INSTALL)\Apache2\icons $(XCOPYSW) >> xc.bat - @echo xcopy docs\man $(INSTALL)\Apache2\man $(XCOPYSW) >> xc.bat - @echo xcopy docs\manual $(INSTALL)\Apache2\manual $(XCOPYSW) >> xc.bat - $(CMD) xc.bat - $(DEL) xc.bat - - - +install :: nlms instscripts FORCE + -copy $(OBJDIR)\Apache2.nlm $(INSTALL)\$(BASEDIR)\*.* + -copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.* + -copy README $(INSTALL)\$(BASEDIR)\*.* + -copy STATUS $(INSTALL)\$(BASEDIR)\*.* + -copy LICENSE $(INSTALL)\$(BASEDIR)\*.* + -copy CHANGES $(INSTALL)\$(BASEDIR)\*.* + -copy VERSIONING $(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 + -$(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 + -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 + @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 + installdev :: FORCE - -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\Apache2\lib\*.* - -copy $(subst /,\,$(APR))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALL)\Apache2\include\*.* - -copy $(subst /,\,$(APR))\*.imp $(INSTALL)\Apache2\lib\*.* - -copy $(subst /,\,$(NWOS))\*.xdc $(INSTALL)\Apache2\lib\*.* - + -copy $(subst /,\,$(AP_WORK))\include\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\$(BASEDIR)\include\*.* + -copy $(subst /,\,$(NWOS))\*.imp $(INSTALL)\$(BASEDIR)\lib\*.* + -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))\*.xdc $(INSTALL)\$(BASEDIR)\lib\*.* + prebuild :: FORCE $(MAKE) -C server -f NWGNUMakefile - $(MAKE) -C srclib/pcre -f NWGNUMakefile - $(MAKE) -C $(APU_WORK)/uri -f NWGNUMakefile + $(MAKE) -C $(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)\*.* - -copy $(APU_WORK)\uri\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.* - + -copy $(PCRE)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.* # # Any specialized rules here @@ -382,7 +442,7 @@ prebuild :: FORCE vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers -vpath %.c os/netware:server/mpm/netware:srclib/pcre +vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE) # # Include the 'tail' makefile that has targets that depend on variables defined @@ -391,3 +451,6 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre include $(AP_WORK)\build\NWGNUtail.inc +include $(AP_WORK)\build\NWGNUscripts.inc + +