X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=NWGNUmakefile;h=e87c7b136fe46341ac119767f670596e8cc0b6a9;hb=87c353a5c03fb1425be7bf5c9be643f9bf3e99e2;hp=869e602ff1f0a99171a035c975e26221dd0bea60;hpb=611952767a907134dd0bbb799632e7771744ea41;p=apache diff --git a/NWGNUmakefile b/NWGNUmakefile index 869e602ff1..e87c7b136f 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -3,11 +3,11 @@ # SUBDIRS = \ - srclib\apr \ + $(APR_WORK) \ build \ support \ modules \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -28,10 +28,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ + $(AP_WORK)/modules/aaa/ \ $(AP_WORK)/modules/filters/ \ $(AP_WORK)/modules/generators/ \ $(AP_WORK)/modules/http/ \ @@ -42,6 +42,7 @@ XINCDIRS += \ $(AP_WORK)/server/mpm/NetWare \ $(AP_WORK)/srclib/pcre \ $(NWOS) \ + $(AP_WORK)/modules/ssl \ $(EOLIST) # @@ -77,7 +78,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -91,7 +92,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -113,13 +114,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, @@ -135,16 +136,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 @@ -164,14 +165,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 @@ -195,37 +196,39 @@ FILES_nlm_objs = \ $(OBJDIR)/config.o \ $(OBJDIR)/connection.o \ $(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 \ $(OBJDIR)/http_request.o \ + $(OBJDIR)/byterange_filter.o \ + $(OBJDIR)/chunk_filter.o \ + $(OBJDIR)/http_etag.o \ + $(OBJDIR)/http_filters.o \ $(OBJDIR)/listen.o \ $(OBJDIR)/log.o \ $(OBJDIR)/main.o \ + $(OBJDIR)/mod_authn_core.o \ + $(OBJDIR)/mod_authn_default.o \ + $(OBJDIR)/mod_authz_core.o \ + $(OBJDIR)/mod_authz_default.o \ $(OBJDIR)/mod_authz_host.o \ - $(OBJDIR)/mod_actions.o \ $(OBJDIR)/mod_alias.o \ - $(OBJDIR)/mod_asis.o \ - $(OBJDIR)/mod_autoindex.o \ - $(OBJDIR)/mod_cgi.o \ $(OBJDIR)/mod_dir.o \ $(OBJDIR)/mod_env.o \ - $(OBJDIR)/mod_imap.o \ $(OBJDIR)/mod_include.o \ $(OBJDIR)/mod_log_config.o \ $(OBJDIR)/mod_mime.o \ $(OBJDIR)/mod_negotiation.o \ $(OBJDIR)/mod_netware.o \ - $(OBJDIR)/mod_nw_ssl.o \ $(OBJDIR)/mod_setenvif.o \ $(OBJDIR)/mod_so.o \ - $(OBJDIR)/mod_userdir.o \ $(OBJDIR)/modules.o \ $(OBJDIR)/mpm_common.o \ $(OBJDIR)/mpm_netware.o \ $(OBJDIR)/pcre.o \ - $(OBJDIR)/pcreposix.o \ $(OBJDIR)/protocol.o \ $(OBJDIR)/provider.o \ $(OBJDIR)/request.o \ @@ -233,22 +236,32 @@ 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_script.o \ $(OBJDIR)/util_time.o \ $(OBJDIR)/util_xml.o \ $(OBJDIR)/vhost.o \ $(EOLIST) +# Build in mod_nw_ssl if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.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. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -264,7 +277,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 # @@ -282,23 +295,28 @@ FILES_nlm_Ximports = \ @netware.imp \ @$(APR)/aprlib.imp \ @libc.imp \ - @ws2nlm.imp \ GetCurrentAddressSpace \ $(EOLIST) - -# + +# Don't link with Winsock if standard sockets are being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports += @ws2nlm.imp \ + $(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 # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -309,42 +327,59 @@ 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-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf - -copy docs\conf\magic $(INSTALL)\Apache2\conf\magic - -copy docs\conf\mime.types $(INSTALL)\Apache2\conf\mime.types - -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 - - - + -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 + $(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)\*.* + # # Any specialized rules here # @@ -360,3 +395,4 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre include $(AP_WORK)\build\NWGNUtail.inc +