flexnbd: Split the proxy mode out into its own binary.

"flexnbd-proxy ..." should be identical in operation to "flexnbd proxy ..."

Rakefile

@@ -7,9 +7,17 @@ CC=ENV['CC'] || "gcc"
 DEBUG  = ENV.has_key?('DEBUG') &&
   %w|yes y ok 1 true t|.include?(ENV['DEBUG'])
 
-ALL_SOURCES =FileList['src/*']
-SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ }
-OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" )
+ALL_SOURCES = FileList['src/*']
+
+PROXY_ONLY_SOURCES = FileList['src/{proxy-main,proxy}.c']
+PROXY_ONLY_OBJECTS = PROXY_ONLY_SOURCES.pathmap( "%{^src,build}X.o" )
+
+SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ } - PROXY_ONLY_SOURCES
+OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" ) - PROXY_ONLY_OBJECTS
+
+PROXY_SOURCES = FileList['src/{ioutil,nbdtypes,readwrite,sockutil,util,parse}.c'] + PROXY_ONLY_SOURCES
+PROXY_OBJECTS = PROXY_SOURCES.pathmap( "%{^src,build}X.o" )
+
 TEST_SOURCES = FileList['tests/unit/*.c']
 TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests/unit,build/tests}X.o" )
 
@@ -38,26 +46,38 @@ if DEBUG
 end
 
 desc "Build the binary and man page"
-task :build => ['build/flexnbd', 'build/flexnbd.1.gz']
+task :build => [:flexnbd, :flexnbd_proxy, :man]
 task :default => :build
 
-desc "Build just the binary"
+desc "Build just the flexnbd binary"
 task :flexnbd => "build/flexnbd"
 
+desc "Build just the flexnbd-proxy binary"
+task :flexnbd_proxy => "build/flexnbd-proxy"
+
 def check(m)
   "build/tests/check_#{m}"
 end
 
 file "README.txt"
+file "README.proxy.txt"
+
+def manpage(name, src)
+  FileUtils.mkdir_p( "build" )
+  sh "a2x --destination-dir build --format manpage #{src}"
+  sh "gzip -f build/#{name}"
+end
 
 file "build/flexnbd.1.gz" => "README.txt" do
-  FileUtils.mkdir_p( "build" )
-  sh "a2x --destination-dir build --format manpage README.txt"
-  sh "gzip -f build/flexnbd.1"
+  manpage("flexnbd.1", "README.txt")
+end
+
+file "build/flexnbd-proxy.1.gz" => "README.proxy.txt" do
+  manpage("flexnbd-proxy.1", "README.proxy.txt")
 end
 
 desc "Build just the man page"
-task :man => "build/flexnbd.1.gz"
+task :man => ["build/flexnbd.1.gz", "build/flexnbd-proxy.1.gz"]
 
 
 namespace "test" do
@@ -83,7 +103,7 @@ namespace "test" do
   end
 
   desc "Run NBD test scenarios"
-  task 'scenarios' => 'flexnbd' do
+  task 'scenarios' => ['build/flexnbd', 'build/flexnbd-proxy'] do
     sh "cd tests/acceptance; ruby nbd_scenarios -v"
   end
 end
@@ -109,6 +129,10 @@ def headers(c)
   `#{CC} -Isrc -MM #{c}`.gsub("\\\n", " ").split(" ")[2..-1]
 end
 
+rule 'build/flexnbd-proxy' => PROXY_OBJECTS do |t|
+  gcc_link(t.name, t.sources)
+end
+
 rule 'build/flexnbd' => OBJECTS do |t|
   gcc_link(t.name, t.sources)
 end
@@ -125,7 +149,6 @@ file check("client") =>
   build/parse.o
   build/client.o
   build/serve.o
-  build/proxy.o
   build/acl.o
   build/ioutil.o
   build/mbox.o
@@ -161,7 +184,6 @@ file check("serve") =>
   build/client.o
   build/flexthread.o
   build/serve.o
-  build/proxy.o
   build/flexnbd.o
   build/mirror.o
   build/status.o
@@ -179,7 +201,6 @@ file check("readwrite") =>
   build/client.o
   build/self_pipe.o
   build/serve.o
-  build/proxy.o
   build/parse.o
   build/acl.o
   build/flexthread.o
@@ -213,22 +234,20 @@ file check("flexnbd") =>
   build/nbdtypes.o
   build/readwrite.o
   build/mirror.o
-  build/serve.o
-  build/proxy.o} do |t|
+  build/serve.o} do |t|
   gcc_link t.name, t.prerequisites + [LIBCHECK]
 end
 
 
 file check("control") =>
-  %w{build/tests/check_control.o} + OBJECTS - ["build/main.o"] do |t|
+  %w{build/tests/check_control.o} + OBJECTS - ["build/main.o", 'build/proxy-main.o', 'build/proxy.o'] do |t|
   gcc_link t.name, t.prerequisites + [LIBCHECK]
 end
 
-
 (TEST_MODULES- %w{control flexnbd acl client serve readwrite util}).each do |m|
   tgt = "build/tests/check_#{m}.o"
   maybe_obj_name = "build/#{m}.o"
-  # Take it out in case we're testing util.o or ioutil.o
+  # Take it out in case we're testing one of the utils
   deps = ["build/ioutil.o", "build/util.o", "build/sockutil.o"] - [maybe_obj_name]
 
   # Add it back in if it's something we need to compile
@@ -244,6 +263,10 @@ OBJECTS.zip( SOURCES ).each do |o,c|
   file o => [c]+headers(c) do |t| gcc_compile( o, c ) end
 end
 
+PROXY_ONLY_OBJECTS.zip( PROXY_ONLY_SOURCES).each do |o, c|
+  file o => [c]+headers(c) do |t| gcc_compile( o, c ) end
+end
+
 TEST_OBJECTS.zip( TEST_SOURCES ).each do |o,c|
   file o => [c] + headers(c) do |t| gcc_compile( o, c ) end
 end
@@ -255,10 +278,9 @@ end
 
 namespace :pkg do
   deb do |t|
-    t.code_files = ALL_SOURCES + ["Rakefile", "README.txt"]
+    t.code_files = ALL_SOURCES + ["Rakefile", "README.txt", "README.proxy.txt"]
     t.pkg_name = "flexnbd"
     t.generate_changelog!
   end
 end
 
-