summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-06-04 13:58:49 +0200
committerMartin Lucina <mato@kotelna.sk>2010-06-04 13:58:49 +0200
commit05b4a7ae787760d5c24e048612b786fa0283854a (patch)
tree570343fb249990f2405439d909bfcd015b456535
parent4d65d7a5a98cbb95430a5b02706ab87d3fa0f56c (diff)
Remove PGM examples from build
-rw-r--r--configure.in9
-rw-r--r--perf/Makefile.am112
2 files changed, 1 insertions, 120 deletions
diff --git a/configure.in b/configure.in
index 7ed5b1c..b81e2bd 100644
--- a/configure.in
+++ b/configure.in
@@ -276,14 +276,6 @@ AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
[build libzmq with PGM extension [default=no]])],
[with_pgm_ext=yes], [with_pgm_ext=no])
-AC_ARG_WITH([pgm-examples], [AS_HELP_STRING([--with-pgm-examples],
- [build PGM examples [default=no]])],
- [with_pgm_examples=yes], [with_pgm_examples=no])
-
-if test "x$with_pgm_ext" = "xno" -a "x$with_pgm_examples" = "xyes"; then
- AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-pgm.]);
-fi
-
if test "x$with_pgm_ext" != "xno"; then
AC_MSG_CHECKING([if the PGM extension is supported on this platform])
@@ -362,7 +354,6 @@ fi
AM_CONDITIONAL(BUILD_PGM, test "x$pgm_ext" = "xyes")
AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno")
AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes")
-AM_CONDITIONAL(BUILD_PGM_EXAMPLES, test "x$with_pgm_examples" = "xyes")
AM_CONDITIONAL(INSTALL_MAN, test "x$install_man" = "xyes")
AM_CONDITIONAL(BUILD_DOC, test "x$build_doc" = "xyes")
diff --git a/perf/Makefile.am b/perf/Makefile.am
index cf95a12..bf3dde9 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,10 +1,6 @@
INCLUDES = -I$(top_builddir)/include
-if BUILD_PGM_EXAMPLES
-PGM_EXAMPLES_BINS = pgmsend pgmrecv
-endif
-
-noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr $(PGM_EXAMPLES_BINS)
+noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
local_lat_LDADD = $(top_builddir)/src/libzmq.la
local_lat_SOURCES = local_lat.cpp
@@ -17,109 +13,3 @@ local_thr_SOURCES = local_thr.cpp
remote_thr_LDADD = $(top_builddir)/src/libzmq.la
remote_thr_SOURCES = remote_thr.cpp
-
-if BUILD_PGM_EXAMPLES
-
-if ON_MINGW
-pgmexamples_diff_flags = \
- -D_WIN32_WINNT=0x0501 \
- -DCONFIG_HAVE_IFR_NETMASK \
- -DCONFIG_BIND_INADDR_ANY \
- -DCONFIG_GALOIS_MUL_LUT \
- -DIF_NAMESIZE=256 \
- -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
- -DCONFIG_HAVE_WSACMSGHDR \
- -DGETTEXT_PACKAGE='"pgm"' \
- -DG_LOG_DOMAIN='"Pgm"'
-
-else
-pgmexamples_diff_flags = \
- -D__need_IOV_MAX \
- -DCONFIG_HAVE_PSELECT \
- -DCONFIG_HAVE_POLL \
- -DCONFIG_HAVE_PPOLL \
- -DCONFIG_HAVE_EPOLL \
- -DCONFIG_HAVE_CLOCK_GETTIME \
- -DCONFIG_HAVE_CLOCK_NANOSLEEP \
- -DCONFIG_HAVE_NANOSLEEP \
- -DCONFIG_HAVE_USLEEP \
- -DCONFIG_HAVE_RTC \
- -DCONFIG_HAVE_TSC \
- -DCONFIG_HAVE_IFR_NETMASK \
- -DCONFIG_HAVE_GETIFADDRS \
- -DCONFIG_HAVE_GETHOSTBYNAME2 \
- -DCONFIG_HAVE_GETPROTOBYNAME_R \
- -DCONFIG_BIND_INADDR_ANY \
- -DCONFIG_GALOIS_MUL_LUT \
- -DCONFIG_HAVE_MCAST_JOIN \
- -DCONFIG_HAVE_IP_MREQN \
- -DCONFIG_HAVE_SPRINTF_GROUPING \
- -DCONFIG_HAVE_HPET \
- -DPGM_GNUC_INTERNAL=G_GNUC_INTERNAL \
- -DGETTEXT_PACKAGE='"pgm"' \
- -DG_LOG_DOMAIN='"Pgm"'
-endif
-
-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 \
- -Wall \
- -Wextra \
- -Wfloat-equal \
- -Wshadow \
- -Wunsafe-loop-optimizations \
- -Wpointer-arith \
- -Wbad-function-cast \
- -Wcast-qual \
- -Wcast-align \
- -Wwrite-strings \
- -Waggregate-return \
- -Wstrict-prototypes \
- -Wold-style-definition \
- -Wmissing-prototypes \
- -Wmissing-declarations \
- -Wmissing-noreturn \
- -Wmissing-format-attribute \
- -Wredundant-decls \
- -Wnested-externs \
- -Winline \
- -pedantic \
- -std=gnu99 \
- --param max-inline-insns-single=600 \
- -D_REENTRANT \
- -D_GNU_SOURCE \
- ${pgmexamples_diff_flags}
-
-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 \
- -Wall \
- -Wextra \
- -Wfloat-equal \
- -Wshadow \
- -Wunsafe-loop-optimizations \
- -Wpointer-arith \
- -Wbad-function-cast \
- -Wcast-qual \
- -Wcast-align \
- -Wwrite-strings \
- -Waggregate-return \
- -Wstrict-prototypes \
- -Wold-style-definition \
- -Wmissing-prototypes \
- -Wmissing-declarations \
- -Wmissing-noreturn \
- -Wmissing-format-attribute \
- -Wredundant-decls \
- -Wnested-externs \
- -Winline \
- -pedantic \
- -std=gnu99 \
- --param max-inline-insns-single=600 \
- -D_REENTRANT \
- -D_GNU_SOURCE \
- ${pgmexamples_diff_flags}
-
-endif