]> granicus.if.org Git - apache/blobdiff - Makefile.win
projects / apache / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update convenience map
[apache] / Makefile.win
diff --git a/Makefile.win b/Makefile.win
index e108982c1c7b44b55b035b97c6683909d0ed1dee..19d3dc77eea86627d09a705ccecd16cb55355cdf 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -160,7 +160,7 @@ clean:      _cleanr _cleand
 y
 <<
 
-!IF EXIST("Apache.mak")
+!IF EXIST("httpd.mak")
 
 _cleanr:
        $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
@@ -202,13 +202,12 @@ _build:
        cd srclib\pcre
         $(MAKE) $(MAKEOPT) -f dftables.mak        CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f pcre.mak            CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f pcreposix.mak       CFG="pcreposix - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd server
         $(MAKE) $(MAKEOPT) -f gen_test_char.mak   CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
         $(MAKE) $(MAKEOPT) -f libhttpd.mak        CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f Apache.mak          CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f httpd.mak           CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 # build ldap prior to authnz_ldap
        cd modules\ldap
         $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -242,13 +241,17 @@ _build:
        cd modules\dav\fs
         $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak      CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
+       cd modules\debug
+        $(MAKE) $(MAKEOPT) -f mod_bucketeer.mak   CFG="mod_bucketeer - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dumpio.mak      CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
        cd modules\experimental
-        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\filters
 !IF EXIST("srclib\zlib")
         $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
+        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
@@ -271,7 +274,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_actions.mak     CFG="mod_actions - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_alias.mak       CFG="mod_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_dir.mak         CFG="mod_dir - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_imap.mak        CFG="mod_imap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_imagemap.mak    CFG="mod_imagemap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_negotiation.mak CFG="mod_negotiation - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_rewrite.mak     CFG="mod_rewrite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_speling.mak     CFG="mod_speling - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -308,6 +311,7 @@ _build:
 !ENDIF
        cd support
         $(MAKE) $(MAKEOPT) -f ab.mak              CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f htcacheclean.mak    CFG="htcacheclean - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f htdbm.mak           CFG="htdbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f htdigest.mak        CFG="htdigest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f htpasswd.mak        CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -370,7 +374,7 @@ _build:
 
 
 _copybin:
-       copy $(LONG)\Apache.$(src_exe)                          "$(inst_exe)" <.y
+       copy $(LONG)\httpd.$(src_exe)                           "$(inst_exe)" <.y
        copy $(LONG)\libhttpd.$(src_dll)                        "$(inst_dll)" <.y
        copy srclib\apr\$(LONG)\libapr-1.$(src_dll)             "$(inst_dll)" <.y
        copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll)  "$(inst_dll)" <.y
@@ -394,7 +398,9 @@ _copybin:
        copy modules\cache\$(LONG)\mod_disk_cache.$(src_so)     "$(inst_so)" <.y
        copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so)        "$(inst_so)" <.y
        copy modules\dav\main\$(LONG)\mod_dav.$(src_so)         "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so)    "$(inst_so)" <.y
+       copy modules\debug\$(LONG)\mod_bucketeer.$(src_so)      "$(inst_so)" <.y
+       copy modules\debug\$(LONG)\mod_dumpio.$(src_so)         "$(inst_so)" <.y
+       copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
 !IF EXIST("srclib\zlib")
        copy modules\filters\$(LONG)\mod_deflate.$(src_so)      "$(inst_so)" <.y
 !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
@@ -416,7 +422,7 @@ _copybin:
        copy modules\mappers\$(LONG)\mod_actions.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_alias.$(src_so)        "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_dir.$(src_so)          "$(inst_so)" <.y
-       copy modules\mappers\$(LONG)\mod_imap.$(src_so)         "$(inst_so)" <.y
+       copy modules\mappers\$(LONG)\mod_imagemap.$(src_so)     "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_negotiation.$(src_so)  "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_rewrite.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_speling.$(src_so)      "$(inst_so)" <.y
@@ -447,6 +453,7 @@ _copybin:
 !ELSE
        copy support\$(LONG)\ab.$(src_exe)                              "$(inst_exe)" <.y
 !ENDIF
+       copy support\$(LONG)\htcacheclean.$(src_exe)            "$(inst_exe)" <.y
        copy support\$(LONG)\htdbm.$(src_exe)                   "$(inst_exe)" <.y
        copy support\$(LONG)\htdigest.$(src_exe)                "$(inst_exe)" <.y
        copy support\$(LONG)\htpasswd.$(src_exe)                "$(inst_exe)" <.y
@@ -470,6 +477,9 @@ _install:
        -mkdir "$(INSTDIR)\bin\iconv"
        -mkdir "$(INSTDIR)\cgi-bin"
        -mkdir "$(INSTDIR)\conf"
+       -mkdir "$(INSTDIR)\conf\extra"
+       -mkdir "$(INSTDIR)\conf\original"
+       -mkdir "$(INSTDIR)\conf\original\extra"
        -mkdir "$(INSTDIR)\error"
        -mkdir "$(INSTDIR)\htdocs"
        -mkdir "$(INSTDIR)\manual"
@@ -609,7 +619,6 @@ BEGIN {
        xcopy docs\docroot      "$(INSTDIR)\htdocs" /d < .a
        xcopy docs\icons        "$(INSTDIR)\icons" /s /d < .a
        xcopy docs\manual       "$(INSTDIR)\manual" /s /d < .a
-       xcopy srclib\pcre\pcre*.h                       "$(INSTDIR)\include" /d < .a
        xcopy srclib\apr-util\xml\expat\lib\expat.h     "$(INSTDIR)\include" /d < .a
        xcopy srclib\apr\include\*.h                    "$(INSTDIR)\include" /d < .a
        xcopy srclib\apr-util\include\*.h               "$(INSTDIR)\include" /d < .a
@@ -618,10 +627,6 @@ BEGIN {
        copy srclib\apr\Lib$(SHORT)\apr_src.pdb         "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\Lib$(SHORT)\aprutil-1.lib  "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\Lib$(SHORT)\aprutil_src.pdb "$(INSTDIR)\lib" <.y
-       copy srclib\pcre\Lib$(SHORT)\pcre.lib           "$(INSTDIR)\lib" <.y
-       copy srclib\pcre\Lib$(SHORT)\pcre_src.pdb       "$(INSTDIR)\lib" <.y
-       copy srclib\pcre\Lib$(SHORT)\pcreposix.lib      "$(INSTDIR)\lib" <.y
-       copy srclib\pcre\Lib$(SHORT)\pcreposix_src.pdb  "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml_src.pdb "$(INSTDIR)\lib" <.y
        copy srclib\apr\$(LONG)\libapr-1.lib            "$(INSTDIR)\lib" <.y
@@ -634,14 +639,14 @@ BEGIN {
        copy $(LONG)\libhttpd.lib                       "$(INSTDIR)\lib" <.y
        copy modules\dav\main\$(LONG)\mod_dav.exp       "$(INSTDIR)\lib" <.y
        copy modules\dav\main\$(LONG)\mod_dav.lib       "$(INSTDIR)\lib" <.y
-       copy docs\conf\magic "$(INSTDIR)\conf\magic.default" <.y
+       copy docs\conf\magic "$(INSTDIR)\conf\original\magic" <.y
        if not exist "$(INSTDIR)\conf\magic" \
-           copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"
-       copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default" <.y
+           copy "$(INSTDIR)\conf\original\magic" "$(INSTDIR)\conf\magic"
+       copy docs\conf\mime.types "$(INSTDIR)\conf\original\mime.types" <.y
        if not exist "$(INSTDIR)\conf\mime.types" \
-           copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
-       copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" <.y
-       -awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\httpd.default.conf"
+           copy "$(INSTDIR)\conf\original\mime.types" "$(INSTDIR)\conf\mime.types"
+       copy docs\conf\httpd-win.conf "$(INSTDIR)\conf\original\httpd.conf" <.y
+       -awk -f <<script.awk "docs/conf/httpd-win.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\original\httpd.conf"
     BEGIN { 
        serverroot = ARGV[2];
        delete ARGV[2];
@@ -657,10 +662,73 @@ BEGIN {
     }
 <<
        if not exist "$(INSTDIR)\conf\httpd.conf" \
-           copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
-!IF EXIST("srclib\openssl")
-       copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
-       -awk -f <<script.awk "docs/conf/ssl-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
+           copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"
+       copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\httpd-autoindex.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /@exp_iconsdir@/, serverroot "/icons" );
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-autoindex.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" "$(INSTDIR)\conf\extra\httpd-autoindex.conf"
+       copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\httpd-dav.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /@@ServerRoot@@/, serverroot );
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
+       copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\httpd-manual.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /@exp_manualdir@/, serverroot "/manual" );
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"
+       copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\httpd-multilang-errordoc.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /@exp_errordir@/, serverroot "/error" );
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"
+       copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\httpd-ssl.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"
     BEGIN { 
        serverroot = ARGV[2];
        delete ARGV[2];
@@ -674,13 +742,58 @@ BEGIN {
        gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
        gsub( /@exp_logfiledir@/, "logs" );
        gsub( /@exp_sysconfdir@/, "conf" );
-       gsub( /@exp_cgidir@/, serverroot "/cgi" );
+       gsub( /@exp_cgidir@/, serverroot "/cgi-bin" );
        print $$0;
     }
 <<
-       if not exist "$(INSTDIR)\conf\ssl.conf" \
-           copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"
-!ENDIF
+       if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"
+       copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\httpd-userdir.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /public_html/, "\"My Documents/My Website\"" );
+       gsub( /\/home/, "C:/WinNT/profiles" ); 
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"
+       copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\httpd-mpm.conf" <.y
+       -awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"
+    BEGIN { 
+       serverroot = ARGV[2];
+       delete ARGV[2];
+       gsub( /\\/, "/", serverroot );
+       "cd" | getline root;
+       gsub( /^\//, substr( root, 1, 2 ) "/", serverroot );
+    }
+    {
+       gsub( /@rel_runtimedir@/, "logs/" );
+       gsub( /\/home/, "C:/WinNT/profiles" ); 
+       print $$0;
+    }
+<<
+       if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"
+       copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\extra\httpd-default.conf" <.y
+       if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"
+       copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\extra\httpd-info.conf" <.y
+       if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"
+       copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\extra\httpd-languages.conf" <.y
+       if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"
+       copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" <.y
+       if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \
+           copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"
        -awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
     { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {
          sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" ); 
Unnamed repository; edit this file 'description' to name the repository.