[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r1086726 - in /httpd/httpd/trunk: Apache.dsw Makefile.win
From:       wrowe () apache ! org
Date:       2011-03-29 20:31:18
Message-ID: 20110329203118.4407C23888D2 () eris ! apache ! org
[Download RAW message or body]

Author: wrowe
Date: Tue Mar 29 20:31:17 2011
New Revision: 1086726

URL: http://svn.apache.org/viewvc?rev=1086726&view=rev
Log:
Someone misunderstood 'dependency' here; we need not *link* to mod_session,
therefore the build order doesn't matter.

Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1086726&r1=1086725&r2=1086726&view=diff
 ==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Tue Mar 29 20:31:17 2011
@@ -1050,9 +1050,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_session
-    End Project Dependency
 }}}
 
 ###############################################################################

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1086726&r1=1086725&r2=1086726&view=diff
 ==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Tue Mar 29 20:31:17 2011
@@ -350,12 +350,6 @@ _build:
 	cd modules\ldap
 	 $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 \
$(CTARGET)  cd ..\..
-# build session prior to auth_form
-	cd modules\session
-	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" \
                RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 \
                $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_session_dbd.mak    CFG="mod_session_dbd - Win32 $(LONG)" \
                RECURSE=0 $(CTARGET)
-	cd ..\..
 	cd modules\database
 	 $(MAKE) $(MAKEOPT) -f mod_dbd.mak         CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 \
$(CTARGET)  cd ..\..
@@ -509,6 +503,11 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" \
RECURSE=0 $(CTARGET)  cd ..\..\..
 !ENDIF
+	cd modules\session
+	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" \
RECURSE=0 $(CTARGET) +	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak \
CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET) +	 $(MAKE) $(MAKEOPT) \
-f mod_session_dbd.mak    CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) \
+	cd ..\..  cd modules\slotmem
 	 $(MAKE) $(MAKEOPT) -f mod_slotmem_plain.mak  CFG="mod_slotmem_plain - Win32 \
$(LONG)" RECURSE=0 $(CTARGET)  $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak    \
CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET)


[prev in list] [next in list] [prev in thread] [next in thread]