add "-l" option to indicate interval is based on localtime not gmt

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index a34637918ee1695cf398d194c0fe176472e569c1..869e602ff1f0a99171a035c975e26221dd0bea60 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -195,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 \
@@ -325,77 +326,32 @@ install :: nlms FORCE
        -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 /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
+       @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
 
 
     
 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\*.*
+       -copy $(subst /,\,$(NWOS))\*.xdc                    $(INSTALL)\Apache2\lib\*.*
     
 #
 # Any specialized rules here
 #
 
-$(OBJDIR)/%.o: server/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
-$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\cc.opt
-       @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+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
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined