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

4 files changed, 11 insertions, 11 deletions

diff --git a/devices/Makefile.am b/devices/Makefile.am
index b5bbd37..4cbad14 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -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
diff --git a/devices/forwarder/Makefile.am b/devices/forwarder/Makefile.am
deleted file mode 100644
index 63230c4..0000000
--- a/devices/forwarder/Makefile.am
+++ /dev/null
@@ -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
-
-
diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am
new file mode 100644
index 0000000..892b7fe
--- /dev/null
+++ b/devices/zmq_forwarder/Makefile.am
@@ -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
+
+
diff --git a/devices/forwarder/forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp
index 8acbc85..8acbc85 100644
--- a/devices/forwarder/forwarder.cpp
+++ b/devices/zmq_forwarder/zmq_forwarder.cpp