You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2007/03/22 17:58:49 UTC
svn commit: r521344 - /httpd/httpd/trunk/NWGNUmakefile
Author: fuankg
Date: Thu Mar 22 09:58:49 2007
New Revision: 521344
URL: http://svn.apache.org/viewvc?view=rev&rev=521344
Log:
changed to use xcopy directly instead of creating a copy batch.
Modified:
httpd/httpd/trunk/NWGNUmakefile
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?view=diff&rev=521344&r1=521343&r2=521344
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Thu Mar 22 09:58:49 2007
@@ -7,7 +7,7 @@
build \
support \
modules \
- $(EOLIST)
+ $(EOLIST)
#
# Get the 'head' of the build environment. This includes default targets and
@@ -78,7 +78,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
@@ -92,7 +92,7 @@
$(EOLIST)
XLFLAGS += \
- $(EOLIST)
+ $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -114,10 +114,10 @@
# 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.
#
ifdef USE_STDSOCKETS
@@ -141,16 +141,16 @@
#
-# 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
@@ -170,14 +170,14 @@
#
# 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
@@ -256,7 +256,7 @@
# Build in mod_nw_ssl if Winsock is being used
ifndef USE_STDSOCKETS
FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \
- $(EOLIST)
+ $(EOLIST)
endif
#
@@ -264,7 +264,7 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ libcpre.o \
$(EOLIST)
#
@@ -280,7 +280,7 @@
# 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
#
@@ -304,22 +304,22 @@
# 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
#
FILES_lib_objs = \
- $(EOLIST)
+ $(EOLIST)
#
# implement targets and dependancies (leave this section alone)
@@ -330,7 +330,7 @@
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
@@ -342,11 +342,11 @@
-copy CHANGES $(INSTALL)\$(BASEDIR)\*.*
-copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl
-copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl
-ifdef USE_STDSOCKETS
+ifdef USE_STDSOCKETS
-awk -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
else
-awk -v BDIR=$(BASEDIR) -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf
-endif
+endif
$(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
@@ -363,17 +363,12 @@
-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
- @echo rem copying the docs directories > xc.bat
- @echo xcopy docs\error $(INSTALL)\$(BASEDIR)\error $(XCOPYSW) >> xc.bat
- @echo xcopy docs\docroot $(INSTALL)\$(BASEDIR)\htdocs $(XCOPYSW) >> xc.bat
- @echo xcopy docs\icons $(INSTALL)\$(BASEDIR)\icons $(XCOPYSW) >> xc.bat
- @echo xcopy docs\man $(INSTALL)\$(BASEDIR)\man $(XCOPYSW) >> xc.bat
- @echo xcopy docs\manual $(INSTALL)\$(BASEDIR)\manual $(XCOPYSW) >> xc.bat
- $(CMD) xc.bat
- $(DEL) xc.bat
+ @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)\$(BASEDIR)\include\*.*
-copy $(subst /,\,$(AP_WORK))\os\netware\*.h $(INSTALL)\$(BASEDIR)\include\*.*
@@ -382,7 +377,7 @@
-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
@@ -390,7 +385,6 @@
-copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
-copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
-
#
# Any specialized rules here
#
@@ -405,4 +399,5 @@
#
include $(AP_WORK)\build\NWGNUtail.inc
+