Merge branch 'master' of git@github.com:sustrik/zeromq2

This commit is contained in:
malosek 2009-09-15 09:46:08 +02:00
commit 712c7bd895
5 changed files with 12 additions and 12 deletions

View File

@ -491,7 +491,7 @@ 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 \
perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \
devices/Makefile devices/forwarder/Makefile)
devices/Makefile devices/zmq_forwarder/Makefile)
AC_MSG_RESULT([])
AC_MSG_RESULT([ ******************************************************** ])

View File

@ -1,6 +1,6 @@
if BUILD_FORWARDER
FORWARDER_DIR = forwarder
FORWARDER_DIR = zmq_forwarder
endif
SUBDIRS = $(FORWARDER_DIR)
DIST_SUBDIRS = forwarder
DIST_SUBDIRS = zmq_forwarder

View File

@ -1,9 +0,0 @@
INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp
bin_PROGRAMS = forwarder
forwarder_LDADD = $(top_builddir)/src/libzmq.la
forwarder_SOURCES = forwarder.cpp
forwarder_CXXFLAGS = -Wall -pedantic -Werror

View File

@ -0,0 +1,9 @@
INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp
bin_PROGRAMS = zmq_forwarder
zmq_forwarder_LDADD = $(top_builddir)/src/libzmq.la
zmq_forwarder_SOURCES = zmq_forwarder.cpp
zmq_forwarder_CXXFLAGS = -Wall -pedantic -Werror