diff options
| author | malosek <malosek@fastmq.com> | 2009-09-16 16:22:23 +0200 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2009-09-16 16:22:23 +0200 |
| commit | 6bfb9e6aaf0adad441d693a679c30ef30aeb5c14 (patch) | |
| tree | 686409162189f30fe29427ea0713a4bea4d05e7d | |
| parent | 3de435a07d460e7eb2423a75e71a409b0f1143e2 (diff) | |
java directory moved into bindings directory II
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | bindings/java/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
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([ ******************************************************** ]) |