[SCM] tango branch, master, updated. debian/8.0.5+dfsg-3-13-g3aeb0c6

Picca Frédéric-Emmanuel picca at debian.org
Tue Jul 9 21:06:22 UTC 2013


The following commit has been merged in the master branch:
commit e97a5f630b3a928c342f537cb0e6d9b5ea8a6178
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue Jul 9 21:40:58 2013 +0200

    Imported Upstream version 8.1.2a+dfsg

diff --git a/lib/java/jzmq/Makefile.am b/lib/java/jzmq/Makefile.am
index bf3f2d3..15b0265 100644
--- a/lib/java/jzmq/Makefile.am
+++ b/lib/java/jzmq/Makefile.am
@@ -23,6 +23,8 @@ JAVAH_FLAGS = -d . -classpath .
 lib_LTLIBRARIES = libjzmq.la
 libjzmq_la_SOURCES = $(JZMQ_CPP_FILES)
 
+libjzmq_la_LIBADD = $(LIBZMQ_LIBS)
+
 #nodist_libjzmq_la_SOURCES = \
 #	$(JZMQ_H_FILES) \
 #	$(JZMQ_HPP_FILES)
diff --git a/lib/java/jzmq/Makefile.in b/lib/java/jzmq/Makefile.in
index 0aadb68..b7c5d27 100644
--- a/lib/java/jzmq/Makefile.in
+++ b/lib/java/jzmq/Makefile.in
@@ -88,7 +88,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libjzmq_la_LIBADD =
+am__DEPENDENCIES_1 =
+libjzmq_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 = libjzmq_la-ZMQ.lo libjzmq_la-Context.lo \
 	libjzmq_la-Socket.lo libjzmq_la-Poller.lo libjzmq_la-util.lo
 am_libjzmq_la_OBJECTS = $(am__objects_1)
@@ -321,6 +322,7 @@ JZMQ_HPP_FILES = jzmq.hpp \
 JAVAH_FLAGS = -d . -classpath .
 lib_LTLIBRARIES = libjzmq.la
 libjzmq_la_SOURCES = $(JZMQ_CPP_FILES)
+libjzmq_la_LIBADD = $(LIBZMQ_LIBS)
 
 #nodist_libjzmq_la_SOURCES = \
 #	$(JZMQ_H_FILES) \

-- 
TANGO distributed control system.



More information about the debian-science-commits mailing list