You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/08/21 00:01:58 UTC
cvs commit: httpd-2.0 Makefile.win Apache.dsw
wrowe 01/08/20 15:01:58
Modified: . Makefile.win Apache.dsw
Log:
Modify Makefile.win to install the ssl-enabled abs.exe binary
as 'bin/ab.exe' if srclib/openssl exists. Adds abs to the Apache.dsw
IDE workspace.
Revision Changes Path
1.71 +16 -6 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Makefile.win 2001/08/20 19:11:56 1.70
+++ Makefile.win 2001/08/20 22:01:58 1.71
@@ -54,17 +54,21 @@
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)" /NORECURSE $(CTARGET)
+ "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)" == ""
@@ -169,6 +173,9 @@
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)
@@ -230,7 +237,8 @@
!IF EXIST("srclib\openssl")
msdev Apache.dsw /MAKE\
"mod_ssl - Win32 $(LONG)"\
- "mod_tls - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ "mod_tls - Win32 $(LONG)"\
+ "abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
!ENDIF
@@ -337,8 +345,10 @@
--------------------------------------------------------------------------------
<<
-!ENDIF
+ 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"
1.59 +18 -0 httpd-2.0/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Apache.dsw 2001/08/07 17:19:04 1.58
+++ Apache.dsw 2001/08/20 22:01:58 1.59
@@ -129,6 +129,24 @@
###############################################################################
+Project: "abs"=".\support\abs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name apr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
Package=<5>