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 2002/05/14 14:37:43 UTC
cvs commit: httpd-2.0 Makefile.win
wrowe 02/05/14 05:37:43
Modified: . Makefile.win
Log:
Fix command line devenv builds for MS VS 7.0 users. msdev is a command
that no longer exists, and we won't count on .mak files [although they
are much faster if they exist, as there is no such concept as /norecurse
in this newer release.] We will use the existance of a converted
Apache.sln (solution) file as proof of 7.0, there isn't another graceful
way to check that I see.
Revision Changes Path
1.100 +29 -0 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- Makefile.win 7 May 2002 08:01:46 -0000 1.99
+++ Makefile.win 14 May 2002 12:37:43 -0000 1.100
@@ -27,6 +27,10 @@
default: _apacher
+!IF ("$(CTARGET)" == "") && EXIST("Apache.sln")
+CTARGET=/build
+!ENDIF
+
!IF !EXIST("srclib\apr")
!MESSAGE Please check out or download and unpack the Apache Portability Runtime
!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory.
@@ -61,6 +65,9 @@
cd support
$(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 .\$(LONG)\abs.exe
cd ..
+!ELSEIF EXIST("Apache.sln")
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs
!ELSE
msdev Apache.dsw /USEENV /MAKE \
"mod_ssl - Win32 $(LONG)" \
@@ -85,6 +92,8 @@
cd modules\filters
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so
cd ..\..
+!ELSEIF EXIST("Apache.sln")
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate
!ELSE
msdev Apache.dsw /USEENV /MAKE \
"mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
@@ -275,6 +284,26 @@
$(MAKE) $(MAKEOPT) -f ApacheMonitor.mak CFG="ApacheMonitor - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f wintty.mak CFG="wintty - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+
+!ELSEIF EXIST("Apache.sln")
+
+_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
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project BuildBin
+!IF EXIST("srclib\openssl")
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs
+!ENDIF
+!IF EXIST("srclib\zlib")
+ devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate
+!ENDIF
!ELSE