X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=NWGNUmakefile;h=f5a9ee4cd3a7bdf764668da725e3f8169c0d5b2b;hb=67a400fb6bcf5810e678dd9d6171d2bc93d06f8d;hp=39af31185e1d5919da9abd323364c25364e874e3;hpb=e6d10bff2dd54aeb6c280aa137fbbf118ffcb1fc;p=apache

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 39af31185e..f5a9ee4cd3 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -119,13 +119,21 @@ NLM_NAME		= Apache2
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	= Apache Web Server 
+NLM_DESCRIPTION	= Apache Web Server $(VERSION_STR)
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
 NLM_THREAD_NAME	= Apache
+
+#
+# This is used by the '-screenname' directive.  If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare
+
+
 #
 # If this is specified, it will override VERSION value in 
 # $(AP_WORK)\build\NWGNUenvironment.inc
@@ -187,6 +195,7 @@ FILES_nlm_objs = \
 	$(OBJDIR)/config.o \
 	$(OBJDIR)/connection.o \
 	$(OBJDIR)/core.o \
+	$(OBJDIR)/eoc_bucket.o \
 	$(OBJDIR)/error_bucket.o \
 	$(OBJDIR)/http_core.o \
 	$(OBJDIR)/http_protocol.o \
@@ -194,12 +203,12 @@ FILES_nlm_objs = \
 	$(OBJDIR)/listen.o \
 	$(OBJDIR)/log.o \
 	$(OBJDIR)/main.o \
-	$(OBJDIR)/mod_access.o \
+	$(OBJDIR)/mod_authz_host.o \
 	$(OBJDIR)/mod_actions.o \
 	$(OBJDIR)/mod_alias.o \
 	$(OBJDIR)/mod_asis.o \
-	$(OBJDIR)/mod_auth.o \
 	$(OBJDIR)/mod_autoindex.o \
+	$(OBJDIR)/mod_cgi.o \
 	$(OBJDIR)/mod_dir.o \
 	$(OBJDIR)/mod_env.o \
 	$(OBJDIR)/mod_imap.o \
@@ -207,6 +216,7 @@ FILES_nlm_objs = \
 	$(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 \
@@ -217,12 +227,13 @@ FILES_nlm_objs = \
 	$(OBJDIR)/pcre.o \
 	$(OBJDIR)/pcreposix.o \
 	$(OBJDIR)/protocol.o \
+	$(OBJDIR)/provider.o \
 	$(OBJDIR)/request.o \
-	$(OBJDIR)/rfc1413.o \
 	$(OBJDIR)/scoreboard.o \
 	$(OBJDIR)/util.o \
 	$(OBJDIR)/util_cfgtree.o \
 	$(OBJDIR)/util_charset.o \
+	$(OBJDIR)/util_debug.o \
 	$(OBJDIR)/util_filter.o \
 	$(OBJDIR)/util_md5.o \
 	$(OBJDIR)/util_nw.o \
@@ -302,94 +313,89 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-	copy $(OBJDIR)\Apache2.nlm $(INSTALL)\Apache2\*.*
+	-copy $(OBJDIR)\Apache2.nlm     $(INSTALL)\Apache2\*.*
 	-copy ABOUT_APACHE              $(INSTALL)\Apache2\*.*
 	-copy README                    $(INSTALL)\Apache2\*.*
 	-copy STATUS                    $(INSTALL)\Apache2\*.*
 	-copy LICENSE                   $(INSTALL)\Apache2\*.*
-	-copy docs\cgi-examples\*.      $(INSTALL)\Apache2\cgi-examples\*.*
-	-copy docs\conf\httpd-std.conf  $(INSTALL)\Apache2\conf\httpd.conf
+	-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\error\*.*            $(INSTALL)\Apache2\error\*.*
-	-copy docs\error\include\*.*    $(INSTALL)\Apache2\error\include\*.*
-	-copy docs\docroot\*.*          $(INSTALL)\Apache2\htdocs\*.*
-	-copy docs\icons\*.*            $(INSTALL)\Apache2\icons\*.*
-	-copy docs\icons\small\*.*      $(INSTALL)\Apache2\icons\small\*.*
-	-copy docs\man\*.*              $(INSTALL)\Apache2\man\*.*
-	-copy docs\manual\*.*           $(INSTALL)\Apache2\manual\*.*
-	-copy docs\manual\developer\*.* $(INSTALL)\Apache2\manual\developer
-	-copy docs\manual\faq\*.*       $(INSTALL)\Apache2\manual\faq
-	-copy docs\manual\howto\*.*     $(INSTALL)\Apache2\manual\howto
-	-copy docs\manual\images\*.*    $(INSTALL)\Apache2\manual\images
-	-copy docs\manual\misc\*.*      $(INSTALL)\Apache2\manual\misc
-	-copy docs\manual\mod\*.*       $(INSTALL)\Apache2\manual\mod
-	-copy docs\manual\platform\*.*  $(INSTALL)\Apache2\manual\platform
-	-copy docs\manual\programs\*.*  $(INSTALL)\Apache2\manual\programs
-	-copy docs\manual\search\*.*    $(INSTALL)\Apache2\manual\search
-	-copy docs\manual\vhosts\*.*    $(INSTALL)\Apache2\manual\vhosts
+	-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 /E /Y >> xc.bat
+	@echo xcopy docs\docroot $(INSTALL)\Apache2\htdocs /E /Y >> xc.bat
+	@echo xcopy docs\icons $(INSTALL)\Apache2\icons /E /Y >> xc.bat
+	@echo xcopy docs\man $(INSTALL)\Apache2\man /E /Y >> xc.bat
+	@echo xcopy docs\manual $(INSTALL)\Apache2\manual /E /Y >> xc.bat
+	$(CMD) xc.bat
+	$(DEL) xc.bat
+
+
     
 installdev :: FORCE
 	-copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\Apache2\include\*.*
 	-copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\Apache2\include\*.*
-	-copy $(subst /,\,$(NWOS))\include\*.h              $(INSTALL)\Apache2\include\*.*
 	-copy $(subst /,\,$(NWOS))\*.imp                    $(INSTALL)\Apache2\lib\*.*
 	-copy $(subst /,\,$(APR))\include\*.h               $(INSTALL)\Apache2\include\*.*
-	-copy $(subst /,\,$(APR))\arch\netware\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\*.*
     
 #
 # Any specialized rules here
 #
 
-$(OBJDIR)/%.o: server/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
 	@echo compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined