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 +++++++------ perf/c/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) 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 \ diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index ec39630..c6d8d8a 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -64,7 +64,7 @@ pgmexamples_diff_flags = \ -DG_LOG_DOMAIN='"Pgm"' endif -pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c +nodist_pgmsend_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmsend.c pgmsend_LDADD = $(top_builddir)/src/libzmq.la pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \ -pipe \ @@ -95,7 +95,7 @@ pgmsend_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/incl -D_GNU_SOURCE \ ${pgmexamples_diff_flags} -pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c +nodist_pgmrecv_SOURCES = ../../foreign/openpgm/@pgm_basename@/openpgm/pgm/examples/pgmrecv.c pgmrecv_LDADD = $(top_builddir)/src/libzmq.la pgmrecv_CFLAGS = -I$(top_srcdir)/foreign/openpgm/@pgm_basename@/openpgm/pgm/include/ -Wall @LIBZMQ_EXTRA_CXXFLAGS@ \ -pipe \ -- cgit v1.2.3