Skip to content

Commit

Permalink
Fix 'make dist' to work with no special magic
Browse files Browse the repository at this point in the history
  • Loading branch information
mato committed Feb 15, 2010
1 parent 8e9b78a commit afb526f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions bindings/java/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions perf/c/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit afb526f

Please sign in to comment.