You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/10/19 00:48:58 UTC
svn commit: r465407 - in /incubator/qpid/trunk/qpid/cpp: Makefile
test/client/client_test.cpp test/client/topic_listener.cpp
test/client/topic_publisher.cpp
Author: aconway
Date: Wed Oct 18 15:48:55 2006
New Revision: 465407
URL: http://svn.apache.org/viewvc?view=rev&rev=465407
Log:
Fix build problems in makefile & client tests.
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile
incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=465407&r1=465406&r2=465407
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Wed Oct 18 15:48:55 2006
@@ -99,10 +99,10 @@
$(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
## Client tests
-
-all-nogen: $(wildcard test/client/*.cpp:.cpp=)
+CLIENT_TEST_SRC := $(wildcard test/client/*.cpp)
+all-nogen: $(CLIENT_TEST_SRC:.cpp=)
test/client/%: test/client/%.cpp
- $(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(LINK_WITH_$(LIB)) $(LINK_WITH_$(LIB)_DEPS)
+ $(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(CLIENT_LIB)
## Daemon executable
Modified: incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp?view=diff&rev=465407&r1=465406&r2=465407
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp Wed Oct 18 15:48:55 2006
@@ -17,15 +17,13 @@
*/
#include <iostream>
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MessageListener.h"
-
-#include "MonitorImpl.h"
-
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/framing/FieldTable.h"
using namespace qpid::client;
using namespace qpid::concurrent;
Modified: incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp?view=diff&rev=465407&r1=465406&r2=465407
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp Wed Oct 18 15:48:55 2006
@@ -15,15 +15,15 @@
* limitations under the License.
*
*/
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include <apr-1/apr_time.h>
#include <iostream>
#include <sstream>
-#include "apr_time.h"
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "Exchange.h"
-#include "MessageListener.h"
-#include "Queue.h"
using namespace qpid::client;
Modified: incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp?view=diff&rev=465407&r1=465406&r2=465407
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp Wed Oct 18 15:48:55 2006
@@ -15,17 +15,17 @@
* limitations under the License.
*
*/
-#include <iostream>
-#include <cstdlib>
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/concurrent/MonitorImpl.h"
#include "unistd.h"
-#include "apr_time.h"
-#include "MonitorImpl.h"
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "Exchange.h"
-#include "MessageListener.h"
-#include "Queue.h"
+#include <apr-1/apr_time.h>
+#include <cstdlib>
+#include <iostream>
using namespace qpid::client;
using namespace qpid::concurrent;