summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--bindings/java/Makefile.am2
-rw-r--r--configure.in4
3 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index b1aa70d..ad4558f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,12 @@ if BUILD_RUBY
DIR_R = ruby
endif
-if BUILD_JAVA
-DIR_J = java
-endif
-
if BUILD_PERF
DIR_PERF = perf
endif
-SUBDIRS = src $(DIR_P) $(DIR_R) $(DIR_J) $(DIR_PERF) devices
-DIST_SUBDIRS = src python ruby java perf devices
+SUBDIRS = src $(DIR_P) $(DIR_R) $(DIR_PERF) devices bindings
+DIST_SUBDIRS = src python ruby perf devices bindings
EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 97e6cb9..966f77d 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -22,7 +22,7 @@ libjzmq_la_SOURCES = \
org_zmq_Socket.h
libjzmq_la_CXXFLAGS = -I$(top_srcdir)/src/libzmq \
-@JAVA_INCLUDE@ -I$(top_srcdir)/c -I$(top_srcdir)/libjzmq -Wall
+@JAVA_INCLUDE@ -I$(top_srcdir)/c -Wall
libjzmq_la_LDFLAGS = -version-info @JLTVER@
libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
diff --git a/configure.in b/configure.in
index dd9f0b6..1cdfd34 100644
--- a/configure.in
+++ b/configure.in
@@ -489,9 +489,9 @@ AC_TYPE_SIGNAL
AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
AC_OUTPUT(Makefile src/Makefile python/Makefile python/setup.py ruby/Makefile \
- java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
+ bindings/java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \
- devices/Makefile devices/zmq_forwarder/Makefile)
+ devices/Makefile devices/zmq_forwarder/Makefile bindings/Makefile)
AC_MSG_RESULT([])
AC_MSG_RESULT([ ******************************************************** ])