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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index d4a675061d..f5a9ee4cd3 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -32,7 +32,6 @@ XINCDIRS	+= \
 			$(AP_WORK)/srclib/include/arch/NetWare \
 			$(AP_WORK)/srclib/apr-util/include \
 			$(AP_WORK)/include \
-			$(AP_WORK)/modules/aaa/ \
 			$(AP_WORK)/modules/filters/ \
 			$(AP_WORK)/modules/generators/ \
 			$(AP_WORK)/modules/http/ \
@@ -120,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
@@ -184,11 +191,11 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/auth_provider.o \
 	$(OBJDIR)/buildmark.o \
 	$(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 \
@@ -220,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 \
@@ -324,70 +332,70 @@ install :: nlms FORCE
 	@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