From f96f53c9687b5a032ef45ce42154a7f944492eec Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 21:03:11 +0100 Subject: ZMQ_POLLERR placeholder added to zmq.h --- bindings/c/zmq.h | 1 + 1 file changed, 1 insertion(+) (limited to 'bindings') diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index d5fb4f4..c6d4692 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -195,6 +195,7 @@ ZMQ_EXPORT int zmq_recv (void *s, zmq_msg_t *msg, int flags); #define ZMQ_POLLIN 1 #define ZMQ_POLLOUT 2 +#define ZMQ_POLLERR 4 typedef struct { -- cgit v1.2.3 From afb526f31a82b8697b5f7e73e50b14705a3a74b2 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Tue, 16 Feb 2010 00:11:38 +0100 Subject: Fix 'make dist' to work with no special magic --- bindings/java/Makefile.am | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bindings') diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 1ce32ac..e3d678f 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -17,19 +17,20 @@ dist_noinst_JAVA = \ lib_LTLIBRARIES = libjzmq.la libjzmq_la_SOURCES = \ Context.cpp \ - org_zmq_Context.h \ - Socket.cpp \ - org_zmq_Socket.h + Socket.cpp +nodist_libjzmq_la_SOURCES = \ + org_zmq_Context.h \ + org_zmq_Socket.h libjzmq_la_CXXFLAGS = @JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall libjzmq_la_LDFLAGS = -version-info @JLTVER@ libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la BUILT_SOURCES = \ - org/zmq/Context.class \ - org_zmq_Context.h \ + org/zmq/Context.class \ + org_zmq_Context.h \ org/zmq/Socket.class \ - org_zmq_Socket.h + org_zmq_Socket.h CLEANFILES = \ org/zmq/Context.class \ -- cgit v1.2.3