You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2008/09/19 22:52:50 UTC

svn commit: r697236 - in /incubator/qpid/trunk/qpid/cpp/examples/qmf-agent: Makefile example.cpp

Author: tross
Date: Fri Sep 19 13:52:50 2008
New Revision: 697236

URL: http://svn.apache.org/viewvc?rev=697236&view=rev
Log:
Cleaned up qmf agent example code

Modified:
    incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile
    incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/example.cpp

Modified: incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile?rev=697236&r1=697235&r2=697236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/Makefile Fri Sep 19 13:52:50 2008
@@ -25,7 +25,7 @@
 
 CC           = gcc
 LIB_DIR      = $(QPID_DIR)/cpp/src/.libs
-CC_INCLUDES  = -I$(SRC_DIR) -I$(QPID_DIR)/cpp/src -I$(QPID_DIR)/cpp/src/gen -I$(GEN_DIR)/org/apache/qpid/agent/example
+CC_INCLUDES  = -I$(SRC_DIR) -I$(QPID_DIR)/cpp/src -I$(QPID_DIR)/cpp/src/gen -I$(GEN_DIR)
 CC_FLAGS     = -g -O3
 LD_FLAGS     = -lqmfagent -L$(LIB_DIR)
 SPEC_DIR     = $(QPID_DIR)/specs
@@ -37,7 +37,7 @@
 vpath %.o   $(OBJ_DIR)
 
 cpps    = $(wildcard $(SRC_DIR)/*.cpp)
-cpps   += $(wildcard $(GEN_DIR)/org/apache/qpid/agent/example/*.cpp)
+cpps   += $(wildcard $(GEN_DIR)/qmf/org/apache/qpid/agent/example/*.cpp)
 deps    = $(addsuffix .d, $(basename $(cpps)))
 objects = $(addsuffix .o, $(basename $(cpps)))
 
@@ -51,7 +51,7 @@
 	@$(MAKE)
 
 gen:
-	$(MGEN) -o $(GEN_DIR) $(SCHEMA_FILE)
+	$(MGEN) -o $(GEN_DIR)/qmf $(SCHEMA_FILE)
 
 clean:
 	rm -rf $(GEN_DIR) $(OUT_FILE) *.d *.o

Modified: incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/example.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/example.cpp?rev=697236&r1=697235&r2=697236&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/example.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/qmf-agent/example.cpp Fri Sep 19 13:52:50 2008
@@ -23,10 +23,10 @@
 #include <qpid/management/ManagementObject.h>
 #include <qpid/agent/ManagementAgent.h>
 #include <qpid/sys/Mutex.h>
-#include "Parent.h"
-#include "Child.h"
-#include "ArgsParentCreate_child.h"
-#include "Package.h"
+#include "qmf/org/apache/qpid/agent/example/Parent.h"
+#include "qmf/org/apache/qpid/agent/example/Child.h"
+#include "qmf/org/apache/qpid/agent/example/ArgsParentCreate_child.h"
+#include "qmf/org/apache/qpid/agent/example/Package.h"
 
 #include <unistd.h>
 #include <cstdlib>