!ENDIF
# Note; tryssl: is only used by the msvc developer studio environment to 'fix up'
-# the build, since conditional dependencies aren't supported
+# the build, since conditional dependencies aren't supported.
#
!IF EXIST("srclib\openssl")
!IF "$(LONG)" == "Debug"
SSLBIN=out32dll
!ENDIF
tryssl:
+!IF EXIST("modules\ssl\mod_ssl.mak")
cd modules\ssl
$(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\tls
$(MAKE) $(MAKEOPT) -f mod_tls.mak CFG="mod_tls - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+ cd support
+ $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..
+!ELSE
+ msdev Apache.dsw /MAKE\
+ "mod_ssl - Win32 $(LONG)"\
+ "mod_tls - Win32 $(LONG)"\
+ "abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
!ELSE
tryssl:
- echo mod_ssl and mod_tls will not build without openssl installed
- echo in $(INSTDIR)\srclib\openssl. They must be precompiled using
- echo the ms/ntdll.mak file. See INSTALL.W32 for details.
+ echo mod_ssl, mod_tls and ab/ssl will not build without openssl
+ echo installed in $(INSTDIR)\srclib\openssl. They must be precompiled
+ echo using the ms/ntdll.mak file. See INSTALL.W32 for details.
!ENDIF
!IF "$(INSTDIR)" == ""
installd:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build _install
+clean: _cleanr _cleand
+
+!IF EXIST("Apache.mak")
+
_cleanr:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
_cleand:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build
-clean:
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
- $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build
-
_build:
echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
cd srclib\apr
cd modules\tls
$(MAKE) $(MAKEOPT) -f mod_tls.mak CFG="mod_tls - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+ cd support
+ $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..
!ENDIF
cd support
$(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f wintty.mak CFG="wintty - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+!ELSE
+
+_cleanr:
+ $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET="/CLEAN" _build
+
+_cleand:
+ $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET="/CLEAN" _build
+
+_build:
+ echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
+ -del $(LONG)\buildmark.obj
+ msdev Apache.dsw /MAKE\
+ "apr - Win32 $(LONG)"\
+ "libapr - Win32 $(LONG)"\
+ "gen_uri_delims - Win32 $(LONG)"\
+ "xml - Win32 $(LONG)"\
+ "aprutil - Win32 $(LONG)"\
+ "libaprutil - Win32 $(LONG)"\
+ "dftables - Win32 $(LONG)"\
+ "pcre - Win32 $(LONG)"\
+ "pcreposix - Win32 $(LONG)"\
+ "gen_test_char - Win32 $(LONG)"\
+ "libhttpd - Win32 $(LONG)"\
+ "Apache - Win32 $(LONG)"\
+ "mod_auth_anon - Win32 $(LONG)"\
+ "mod_auth_dbm - Win32 $(LONG)"\
+ "mod_auth_digest - Win32 $(LONG)"\
+ "mod_file_cache - Win32 $(LONG)"\
+ "mod_dav - Win32 $(LONG)"\
+ "mod_dav_fs - Win32 $(LONG)"\
+ "mod_info - Win32 $(LONG)"\
+ "mod_status - Win32 $(LONG)"\
+ "mod_rewrite - Win32 $(LONG)"\
+ "mod_speling - Win32 $(LONG)"\
+ "mod_cern_meta - Win32 $(LONG)"\
+ "mod_expires - Win32 $(LONG)"\
+ "mod_headers - Win32 $(LONG)"\
+ "mod_usertrack - Win32 $(LONG)"\
+ "ab - Win32 $(LONG)"\
+ "htpasswd - Win32 $(LONG)"\
+ "htdigest - Win32 $(LONG)"\
+ "logresolve - Win32 $(LONG)"\
+ "rotatelogs - Win32 $(LONG)"\
+ "ApacheMonitor - Win32 $(LONG)"\
+ "wintty - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!IF EXIST("srclib\openssl")
+ msdev Apache.dsw /MAKE\
+ "mod_ssl - Win32 $(LONG)"\
+ "mod_tls - Win32 $(LONG)"\
+ "abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ENDIF
+
_install:
-mkdir "$(INSTDIR)"
-mkdir "$(INSTDIR)\bin"
-mkdir "$(INSTDIR)\cgi-bin"
-mkdir "$(INSTDIR)\conf"
+ -mkdir "$(INSTDIR)\error"
-mkdir "$(INSTDIR)\htdocs"
-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 ABOUT_APACHE "$(INSTDIR)\ABOUT_APACHE.txt"
+ copy CHANGES "$(INSTDIR)\CHANGES.txt"
+ copy INSTALL "$(INSTDIR)\INSTALL.txt"
+ copy LICENSE "$(INSTDIR)\LICENSE.txt"
+!IF EXIST("srclib\openssl")
+ copy << + README "$(INSTDIR)\README.txt"
+
+ This product includes cryptographic software written by
+ Eric Young (eay@cryptsoft.com). This product includes software written
+ by Tim Hudson (tjh@cryptsoft.com). This product includes software
+ developed by the OpenSSL Project for use in the OpenSSL Toolkit.
+ (http://www.openssl.org/)
+<<
+!ELSE
+# --- just a vanilla copy, in this case.
+ copy README "$(INSTDIR)\README.txt"
+!ENDIF
copy $(LONG)\Apache.exe "$(INSTDIR)\bin"
copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin"
copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin"
-copy srclib\openssl\$(SSLBIN)\openssl.exe "$(INSTDIR)\bin"
-copy srclib\openssl\$(SSLBIN)\libeay32.dll "$(INSTDIR)\bin"
-copy srclib\openssl\$(SSLBIN)\ssleay32.dll "$(INSTDIR)\bin"
-!ENDIF
+ -copy srclib\openssl\LICENSE "$(INSTDIR)\OPENSSL-LICENSE.txt"
+ -copy << + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt"
+
+ Apache HTTP Server 2.0 Limited OpenSSL Distribution 17 Aug 2001
+
+ This binary distribution includes the minimal components of OpenSSL required
+ to support mod_ssl and mod_tls for Apache HTTP Server version 2.0 (details
+ are listed in OPENSSL-README.txt.) For the complete list of CHANGES to this
+ and later versions of OpenSSL, please refer to the definative source,
+ <http://www.openssl.org/news/changelog.html>, or see the CHANGES file in the
+ full binary or source distribution package from <http://www.openssl.org/>.
+
+ These OpenSSL binaries were built for distribution from the U.S. without
+ support for the patented encryption methods IDEA, MDC-2 or RC5.
+
+--------------------------------------------------------------------------------
+<<
+ -copy << + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt"
+
+ Apache HTTP Server 2.0 Limited OpenSSL Distribution 19 Aug 2001
+
+ This binary installation of OpenSSL is a limited distribution of the documents
+ OPENSSL-LICENSE.txt, OPENSSL-NEWS.txt and OPENSSL-README.txt, and the binaries
+
+ libeay32.dll
+ ssleay32.dll
+ openssl.exe
+
+ These are the minimal libraries and tools required to use mod_ssl or mod_tls
+ as distributed with Apache HTTP Server version 2.0. No library files, headers
+ or sources are distributed with this binary distribution. Please refer to the
+ <http://www.openssl.org/> site for complete source or binary distributions.
+
+ These OpenSSL binaries were built for distribution from the U.S. without
+ support for the patented encryption methods IDEA, MDC-2 or RC5.
+
+ The Apache HTTP Project only supports the binary distribution of these files
+ and development of the mod_ssl and mod_tls modules. We cannot provide support
+ assistance for using or configuring the OpenSSL package or these modules.
+ Please refer all installation and configuration questions to the appropriate
+ forum, such as the user supported newsgroups comp.infosystems.www.servers.unix
+ or comp.infosystems.www.servers.ms-windows, or see the support options listed
+ at <http://www.openssl.org/support/>.
+
+--------------------------------------------------------------------------------
+<<
+ copy support\$(LONG)\abs.exe "$(INSTDIR)\bin\ab.exe"
+!ELSE
copy support\$(LONG)\ab.exe "$(INSTDIR)\bin"
+!ENDIF
copy support\$(LONG)\htpasswd.exe "$(INSTDIR)\bin"
copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin"
copy support\$(LONG)\logresolve.exe "$(INSTDIR)\bin"
}
<<
copy docs\cgi-examples\test-cgi.bat "$(INSTDIR)\cgi-bin"
+ xcopy docs\error "$(INSTDIR)\error" /d < <<
+A
+<<
xcopy docs\docroot "$(INSTDIR)\htdocs" /d < <<
A
<<
xcopy docs\manual "$(INSTDIR)\htdocs\manual" /s /d < <<
A
<<
- xcopy include\*.h "$(INSTDIR)\include" /d < <<
+ xcopy srclib\pcre\pcre*.h "$(INSTDIR)\include" /d < <<
A
<<
+ copy srclib\apr-util\xml\expat\lib\expat.h "$(INSTDIR)\include"
xcopy srclib\apr\include\*.h "$(INSTDIR)\include" /d < <<
A
<<
xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < <<
A
<<
- xcopy srclib\pcre\*.h "$(INSTDIR)\include\pcre" /d < <<
+ xcopy include\*.h "$(INSTDIR)\include" /d < <<
A
<<
xcopy docs\icons "$(INSTDIR)\icons" /s /d < <<
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 $(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"
+# ### until we determine if it's safe to change expat>libexpat and xml>expat
+# within our cvs tree... at least remain consistent to our naming conventions;
+ copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib"
+ copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib"
+ copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib"
+ copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib"
+ copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib"
+ copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib"
+ copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib"
+ copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib"
+ copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\lib"
copy docs\conf\magic "$(INSTDIR)\conf\magic.default"
if not exist "$(INSTDIR)\conf\magic" \
copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"
projects / apache / blobdiff