build system tuning

4 files changed, 30 insertions, 7 deletions

diff --git a/perf/Makefile.am b/perf/Makefile.am
index dbebc93..a3c13ad 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = c cpp python
-DIST_SUBDIRS = c cpp python
+if BUILD_C
+PERF_DIR_C = c
+endif
+
+if BUILD_CPP
+PERF_DIR_CPP = cpp
+endif
+
+if BUILD_PYTHON
+PERF_DIR_P = python
+endif
+
+if BUILD_JAVA
+PERF_DIR_J = java
+endif
+
+if BUILD_RUBY
+PERF_DIR_R = ruby
+endif
+
+SUBDIRS = $(PERF_DIR_C) $(PERF_DIR_CPP) $(PERF_DIR_P) \
+    $(PERF_DIR_J) $(PERF_DIR_R)
+DIST_SUBDIRS = c cpp python java ruby
diff --git a/perf/java/Makefile.am b/perf/java/Makefile.am
new file mode 100644
index 0000000..6552e80
--- /dev/null
+++ b/perf/java/Makefile.am
@@ -0,0 +1,5 @@
+AM_JAVACFLAGS=-classpath $(top_builddir)/java 
+
+dist_noinst_JAVA = local_lat.java remote_lat.java local_thr.java \
+remote_thr.java
+
diff --git a/perf/python/Makefile.am b/perf/python/Makefile.am
index cda8477..c504159 100644
--- a/perf/python/Makefile.am
+++ b/perf/python/Makefile.am
@@ -1,5 +1 @@
-EXTRA_DIST = \
-    local_lat.py \
-    remote_lat.py \
-    local_thr.py \
-    remote_thr.py
+EXTRA_DIST = *.py 
diff --git a/perf/ruby/Makefile.am b/perf/ruby/Makefile.am
new file mode 100644
index 0000000..6bcd5da
--- /dev/null
+++ b/perf/ruby/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = *.rb