warden: Move tool to separate dir and fix build process

Change-Id: I2fd62cd14ce6779d2416765b446daf732d02470a

warden/lib/warden/container/features/mem_limit.rb

@@ -20,7 +20,7 @@ class OomNotifier
           def initialize(container)
             @container = container
 
-            oom_notifier_path = File.expand_path("../../../../../src/oom", __FILE__)
+            oom_notifier_path = File.expand_path("../../../../../src/oom/oom", __FILE__)
             @child = DeferredChild.new(oom_notifier_path, container.cgroup_root_path)
 
             # Zero exit status means a process OOMed, non-zero means an error occurred

warden/src/Makefile

@@ -1,25 +1,8 @@
-OPTIMIZATION?=-O0
-DEBUG?=-g -ggdb -rdynamic
-BINS=report_quota runner clone
+default: all
 
-all: $(BINS)
+# Proxy any target to the Makefiles in the per-tool directories
+%:
+	cd clone && $(MAKE) $@
+	cd oom && $(MAKE) $@
 
-clean:
-		rm -f *.o $(BINS)
-
-.PHONY: all clean
-
-report_quota: report_quota.o
-		$(CC) -o $@ $^
-
-runner: runner.o
-		$(CC) -o $@ $^
-
-clone: clone.o
-		$(CC) -o $@ -lutil $^
-
-oom: oom.o
-		$(CC) -o $@ $^
-
-%.o: %.c
-		$(CC) -c -Wall -D_GNU_SOURCE $(OPTIMIZATION) $(DEBUG) $(CFLAGS) $<
+.PHONY: default

warden/src/clone/.gitignore

@@ -1 +1,2 @@
 clone
+*.o

warden/src/oom/.gitignore

@@ -0,0 +1,2 @@
+oom
+*.o

warden/src/oom/Makefile

@@ -0,0 +1,15 @@
+OPTIMIZATION?=-O0
+DEBUG?=-g -ggdb -rdynamic
+
+all: oom
+
+clean:
+		rm -f *.o oom
+
+.PHONY: all clean
+
+oom: oom.o
+		$(CC) -o $@ -lutil $^
+
+%.o: %.c
+		$(CC) -c -Wall -D_GNU_SOURCE $(OPTIMIZATION) $(DEBUG) $(CFLAGS) $<