Commit 65cc4d08 authored by Gregg Lewis Smith's avatar Gregg Lewis Smith
Browse files

merge r1774657 from trunk 

add .mak/dep for command line build


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1856233 13f79535-47bb-0310-9956-ffa450edef68
parent 9b23fa44

Apache-apr2.dsw

+21 −0
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ Package=<4> 
    Project_Dep_Name mod_socache_shmcb

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_socache_redis

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_speling

    End Project Dependency

    Begin Project Dependency
@@ -2789,6 +2792,24 @@ Package=<4> 


###############################################################################



Project: "mod_socache_redis"=.\modules\cache\mod_socache_redis.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

}}}



###############################################################################



Project: "mod_speling"=.\modules\mappers\mod_speling.dsp - Package Owner=<4>



Package=<5>

Apache.dsw

+24 −0
Original line number Diff line number Diff line
@@ -357,6 +357,9 @@ Package=<4> 
    Project_Dep_Name mod_socache_shmcb

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_socache_redis

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_speling

    End Project Dependency

    Begin Project Dependency
@@ -3296,6 +3299,27 @@ Package=<4> 


###############################################################################



Project: "mod_socache_redis"=.\modules\cache\mod_socache_redis.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

}}}



###############################################################################



Project: "mod_speling"=.\modules\mappers\mod_speling.dsp - Package Owner=<4>



Package=<5>

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ SET(MODULE_LIST 
  "modules/cache/mod_socache_dc+O+distcache small object cache provider"

  "modules/cache/mod_socache_memcache+I+memcache small object cache provider"

  "modules/cache/mod_socache_shmcb+I+ shmcb small object cache provider"

  "modules/cache/mod_socache_redis+I+redis small object cache provider"

  "modules/cluster/mod_heartbeat+I+Generates Heartbeats"

  "modules/cluster/mod_heartmonitor+I+Collects Heartbeats"

  "modules/core/mod_macro+I+Define and use macros in configuration files"

Makefile.win

+2 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ _build: 
#	 $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak  CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_socache_redis.mak CFG="mod_socache_redis - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

	cd modules\core

	 $(MAKE) $(MAKEOPT) -f mod_macro.mak    CFG="mod_macro - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -819,6 +820,7 @@ _copybin: 
#	copy modules\cache\$(LONG)\mod_socache_dc.$(src_so)	"$(inst_so)" <.y

	copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)" <.y

	copy modules\cache\$(LONG)\mod_socache_shmcb.$(src_so)	"$(inst_so)" <.y

	copy modules\cache\$(LONG)\mod_socache_redis.$(src_so)	"$(inst_so)" <.y

	copy modules\core\$(LONG)\mod_macro.$(src_so) 	"$(inst_so)" <.y

	copy modules\core\$(LONG)\mod_watchdog.$(src_so) 	"$(inst_so)" <.y

	copy modules\cluster\$(LONG)\mod_heartbeat.$(src_so)	"$(inst_so)" <.y

modules/cache/mod_socache_redis.dep

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Generated Dependency File, included by mod_socache_shmcb.mak



..\..\build\win32\httpd.rc : \

	"..\..\include\ap_release.h"\