qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r604291 - in /incubator/qpid/trunk/qpid/cpp/examples: Makefile.am examples/direct/direct_persistent_config_queues.cpp examples/direct/direct_persistent_publisher.cpp examples/direct/direct_publisher.cpp examples/fanout/fanout_publisher.cpp
Date Fri, 14 Dec 2007 20:49:15 GMT
Author: aconway
Date: Fri Dec 14 12:49:14 2007
New Revision: 604291

URL: http://svn.apache.org/viewvc?rev=604291&view=rev
Log:
examples/Makefile.am: Fixed build failures.
Removed unused files:
 examples/examples/direct/direct_persistent_config_queues.cpp
 examples/examples/direct/direct_persistent_publisher.cpp
 examples/examples/direct/direct_publisher.cpp
 examples/examples/fanout/fanout_publisher.cpp

Removed:
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_persistent_config_queues.cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_persistent_publisher.cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/direct/direct_publisher.cpp
    incubator/qpid/trunk/qpid/cpp/examples/examples/fanout/fanout_publisher.cpp
Modified:
    incubator/qpid/trunk/qpid/cpp/examples/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=604291&r1=604290&r2=604291&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Fri Dec 14 12:49:14 2007
@@ -8,19 +8,20 @@
 	examples/fanout/Makefile				\
 	examples/fanout/declare_queues.cpp			\
 	examples/fanout/listener.cpp				\
-	examples/fanout/fanout_publisher.cpp			\
+	examples/fanout/fanout_producer.cpp			\
 	examples/pub-sub/Makefile				\
 	examples/pub-sub/topic_publisher.cpp			\
 	examples/pub-sub/topic_listener.cpp			\
 	examples/direct/Makefile				\
-	examples/direct/direct_publisher.cpp			\
-	examples/direct/direct_persistent_config_queues.cpp	\
+	examples/direct/direct_producer.cpp			\
 	examples/direct/listener.cpp				\
-	examples/direct/declare_queues.cpp			\
-	examples/direct/direct_persistent_publisher.cpp
-
-EXTRA_DIST=$(nobase_pkgdata_DATA)
+	examples/direct/declare_queues.cpp
 
+EXTRA_DIST=$(nobase_pkgdata_DATA) verify \
+	examples/request-response/verify.in \
+	examples/fanout/verify.in \
+	examples/pub-sub/verify.in \
+	examples/direct/verify.in 
 
 # Note: we don't use normal automake SUBDIRS because the example
 # makefiles don't understand all the recursive automake targets.
@@ -29,23 +30,24 @@
 	cd examples; $(MAKE) clean
 	rm -f examples/*/*.out  examples/*/*.wait 
 
-abs_srcdir=@abs_srcdir@
 abs_top_builddir=@abs_top_builddir@
 abs_top_srcdir=@abs_top_srcdir@
 
+VERIFY=$(abs_top_srcdir)/examples/verify
+
 # Build the examples in the source tree.
 all-local:
 	cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="-I../../$(top_srcdir)/src -I../../$(top_srcdir)/src/gen
-I../../$(top_builddir)/src/gen -L../../$(top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs"
all
 
 # Verify the examples in the buid tree.
-check-local:
-	cd examples && QPIDD=$(abs_top_builddir)/src/qpidd $(abs_top_srcdir)/examples/verify
+check-local: all-local
+	cd examples && QPIDD=$(abs_top_builddir)/src/qpidd $(VERIFY)
 
 # Build and verify the installed examples, then clean up to avoid rpmbuild warnings.
 EXAMPLE_FLAGS=-I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir) -Wl,-rpath,$(DESTDIR)$(libdir)
 EXAMPLE_DIR=$(DESTDIR)$(pkgdatadir)/examples 
 installcheck-local:
 	cd $(EXAMPLE_DIR) && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
-	cd $(EXAMPLE_DIR) && QPIDD=$(DESTDIR)$(sbindir)/qpidd $(abs_srcdir)/verify
+	cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(VERIFY)
 	cd $(EXAMPLE_DIR) && $(MAKE) clean
 



Mime
View raw message