]> granicus.if.org Git - apache/blobdiff - Makefile.win
projects / apache / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
get the last worker in a given child initialized properly
[apache] / Makefile.win
diff --git a/Makefile.win b/Makefile.win
index 056e1e6a3f5279b56c3c70ced7b0fd7ba735221f..28757e783202f7d9f4b457471aece6681cac33ab 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -9,16 +9,19 @@
 #   _cleanr    - remove (most) files generated by a Release build
 #   _cleand    - remove (most) files generated by a Debug build
 #
-# The default installation directory is \Apache. This can be changed
+# The default installation directory is \Apache2.0. This can be changed
 # with the INSTDIR macro, for example:
 #
 #   nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
 #
 # Note: this does *NOT* change the compiled in default "server root"
+# Also be aware that certain awk's will not accept backslahed names,
+# so the server root should be given in forward slashes (quoted),
+# preferably with the drive designation!
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache
-!MESSAGE Using default install directory \Apache
+INSTDIR=\Apache2.0
+!MESSAGE Using default install directory \Apache2.0
 !ENDIF 
 
 !IFNDEF MAKEOPT
@@ -59,17 +62,15 @@ clean:
 _build:
        echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
        cd srclib\apr
-#       aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp
-        $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\apr-util
-#       aprutildll creates the dynamic apr-util.dll from the static library project aprutil.dsp
         $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f aprutildll.mak CFG="aprutildll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\expat-lite
-        $(MAKE) $(MAKEOPT) -f expatlib.mak CFG="expatlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\pcre
         $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -80,10 +81,8 @@ _build:
         $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
-        -del Core$(SHORT)\buildmark.obj
-#       ApacheCoreDll creates the dynamic ApacheCore.dll from the static library project ApacheCore
-        $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        -del $(LONG)\buildmark.obj
+        $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd modules\aaa
         $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -133,47 +132,84 @@ _install:
        -mkdir "$(INSTDIR)\htdocs\manual"
        -mkdir "$(INSTDIR)\icons"
        -mkdir "$(INSTDIR)\include"
+       -mkdir "$(INSTDIR)\include\xml"
+       -mkdir "$(INSTDIR)\include\pcre"
        -mkdir "$(INSTDIR)\lib"
        -mkdir "$(INSTDIR)\libexec"
        -mkdir "$(INSTDIR)\logs"
        -mkdir "$(INSTDIR)\modules"
 #      -mkdir "$(INSTDIR)\proxy"
-       copy Apache$(SHORT)\Apache.exe "$(INSTDIR)"
-       copy Core$(SHORT)\ApacheCore.dll "$(INSTDIR)"
-       copy srclib\apr\$(LONG)\aprlib.dll "$(INSTDIR)"
-        copy srclib\apr-util\$(LONG)\apr-util.dll "$(INSTDIR)"
-        copy srclib\expat-lite\$(LONG)\expatlib.dll "$(INSTDIR)"
-        copy modules\aaa\mod_auth_anon$(SHORT)\mod_auth_anon.dll "$(INSTDIR)\modules"
-       copy modules\aaa\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll "$(INSTDIR)\modules"
-       copy modules\aaa\mod_auth_digest$(SHORT)\mod_auth_digest.dll "$(INSTDIR)\modules"
-       copy modules\cache\mod_file_cache$(SHORT)\mod_file_cache.dll "$(INSTDIR)\modules"
-        copy modules\dav\fs\mod_dav_fs$(SHORT)\mod_dav_fs.dll "$(INSTDIR)\modules"
-        copy modules\dav\main\mod_dav$(SHORT)\mod_dav.dll "$(INSTDIR)\modules"
-#       copy modules\generators\mod_info$(SHORT)\mod_info.dll "$(INSTDIR)\modules"
-        copy modules\generators\mod_status$(SHORT)\mod_status.dll "$(INSTDIR)\modules"
-        copy modules\mappers\mod_rewrite$(SHORT)\mod_rewrite.dll "$(INSTDIR)\modules"
-       copy modules\mappers\mod_speling$(SHORT)\mod_speling.dll "$(INSTDIR)\modules"
-       copy modules\metadata\mod_cern_meta$(SHORT)\mod_cern_meta.dll "$(INSTDIR)\modules"
-       copy modules\metadata\mod_expires$(SHORT)\mod_expires.dll "$(INSTDIR)\modules"
-       copy modules\metadata\mod_headers$(SHORT)\mod_headers.dll "$(INSTDIR)\modules"
-       copy modules\metadata\mod_usertrack$(SHORT)\mod_usertrack.dll "$(INSTDIR)\modules"
-#       copy modules\proxy\mod_proxy$(SHORT)\mod_proxy.dll "$(INSTDIR)\modules"
+       copy $(LONG)\Apache.exe "$(INSTDIR)\bin"
+       copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin"
+       copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin"
+        copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin"
+        copy srclib\expat-lite\$(LONG)\libexpat.dll "$(INSTDIR)\bin"
+        copy modules\aaa\$(LONG)\mod_auth_anon.so "$(INSTDIR)\modules"
+       copy modules\aaa\$(LONG)\mod_auth_dbm.so "$(INSTDIR)\modules"
+       copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules"
+       copy modules\cache\$(LONG)\mod_file_cache.so "$(INSTDIR)\modules"
+        copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules"
+        copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules"
+#       copy modules\generators\$(LONG)\mod_info.so "$(INSTDIR)\modules"
+        copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules"
+        copy modules\mappers\$(LONG)\mod_rewrite.so "$(INSTDIR)\modules"
+       copy modules\mappers\$(LONG)\mod_speling.so "$(INSTDIR)\modules"
+       copy modules\metadata\$(LONG)\mod_cern_meta.so "$(INSTDIR)\modules"
+       copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules"
+       copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"
+       copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"
+#       copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"
         copy support\$(LONG)\ab.exe "$(INSTDIR)\bin"
         copy support\$(LONG)\htpasswd.exe "$(INSTDIR)\bin"
        copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin"
        copy support\$(LONG)\logresolve.exe "$(INSTDIR)\bin"
        copy support\$(LONG)\rotatelogs.exe "$(INSTDIR)\bin"
         copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl"
-        xcopy docs\docroot "$(INSTDIR)\htdocs" /d /q
-        xcopy docs\manual "$(INSTDIR)\htdocs\manual" /s /d /q
-        xcopy docs\icons "$(INSTDIR)\icons" /s /d /q
-        copy docs\conf\magic "$(INSTDIR)\conf\magic.default"
+        xcopy docs\docroot "$(INSTDIR)\htdocs" /d < <<
+A
+<<
+        xcopy docs\manual "$(INSTDIR)\htdocs\manual" /s /d < <<
+A
+<<
+       xcopy include\*.h "$(INSTDIR)\include" /d < <<
+A
+<<
+       xcopy srclib\apr\include\*.h "$(INSTDIR)\include" /d < <<
+A
+<<
+       xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < <<
+A
+<<
+       xcopy srclib\expat-lite\*.h "$(INSTDIR)\include\xml" /d < <<
+A
+<<
+       xcopy srclib\pcre\*.h "$(INSTDIR)\include\pcre" /d < <<
+A
+<<
+        xcopy docs\icons "$(INSTDIR)\icons" /s /d < <<
+A
+<<
+       copy srclib\apr\Lib$(SHORT)\apr.lib "$(INSTDIR)\lib"
+       copy srclib\apr-util\Lib$(SHORT)\aprutil.lib "$(INSTDIR)\lib"
+       copy srclib\pcre\Lib$(SHORT)\pcre.lib "$(INSTDIR)\lib"
+       copy srclib\pcre\Lib$(SHORT)\pcreposix.lib "$(INSTDIR)\lib"
+       copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\libexec"
+       copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\libexec"
+       copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\libexec"
+       copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\libexec"
+       copy srclib\expat-lite\$(LONG)\libexpat.lib "$(INSTDIR)\libexec"
+       copy srclib\expat-lite\$(LONG)\libexpat.exp "$(INSTDIR)\libexec"
+       copy $(LONG)\libhttpd.exp "$(INSTDIR)\libexec"
+       copy $(LONG)\libhttpd.lib "$(INSTDIR)\libexec"
+       copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\libexec"
+       copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\libexec"
+       copy docs\conf\magic "$(INSTDIR)\conf\magic.default"
         if not exist "$(INSTDIR)\conf\magic" \
             copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"
         copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default"
         if not exist "$(INSTDIR)\conf\mime.types" \
             copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
-       awk -f << docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
+       awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
     BEGIN { 
         srcfl = ARGV[1];
         dstfl = ARGV[2];
@@ -187,10 +223,10 @@ _install:
 <<
        if not exist "$(INSTDIR)\conf\httpd.conf" \
             copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
-       awk -f << support\dbmmanage >"$(INSTDIR)\bin\dbmmanage.pl"
+       awk -f <<script.awk "support\dbmmanage" >"$(INSTDIR)\bin\dbmmanage.pl"
     { if ( $$0 !~ /^#.*-lsdbm/) {
           gsub( /AnyDBM_File::ISA = qw\(.*\)/, "AnyDBM_File::ISA = qw(SDBM_File)" ); 
-          print $$0;
-      } 
+      }
+      print $$0;
     }
 <<
Unnamed repository; edit this file 'description' to name the repository.