summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-09-02 10:23:01 +0200
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-09-02 10:23:01 +0200
commit5e08a89d1c0edf44e15f262dd0f27a1c03bcd699 (patch)
treeeba28221c1e5e69418078df406609e8d3dffe64c /Makefile.am
parent6a5120b1f1c48d19b777f76ac756b00fb624d110 (diff)
parent1f06d99a0f563fdc32e9c00392f9875ba3009593 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 15424ff..3055e64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,5 +8,9 @@ if BUILD_RUBY
DIR_R = ruby
endif
-SUBDIRS = src perf $(DIR_P) $(DIR_R)
-DIST_SUBDIRS = src perf $(DIR_P) $(DIR_R)
+if BUILD_JAVA
+DIR_J = java
+endif
+
+SUBDIRS = src perf $(DIR_P) $(DIR_R) $(DIR_J)
+DIST_SUBDIRS = src perf $(DIR_P) $(DIR_R) $(DIR_J)