From 88e386e9130caecb9a095dd0362dbeff89828adc Mon Sep 17 00:00:00 2001
From: Ted Ross <tross@apache.org>
Date: Fri, 19 Sep 2008 20:52:50 +0000
Subject: Cleaned up qmf agent example code

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@697236 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/examples/qmf-agent/Makefile    | 6 +++---
 cpp/examples/qmf-agent/example.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp')

diff --git a/cpp/examples/qmf-agent/Makefile b/cpp/examples/qmf-agent/Makefile
index 0fc7ece413..4c5daa6888 100644
--- a/cpp/examples/qmf-agent/Makefile
+++ b/cpp/examples/qmf-agent/Makefile
@@ -25,7 +25,7 @@ OUT_FILE    = $(SRC_DIR)/qmf-agent
 
 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 %.d   $(OBJ_DIR)
 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 @@ all: gen
 	@$(MAKE)
 
 gen:
-	$(MGEN) -o $(GEN_DIR) $(SCHEMA_FILE)
+	$(MGEN) -o $(GEN_DIR)/qmf $(SCHEMA_FILE)
 
 clean:
 	rm -rf $(GEN_DIR) $(OUT_FILE) *.d *.o
diff --git a/cpp/examples/qmf-agent/example.cpp b/cpp/examples/qmf-agent/example.cpp
index 2087ee0811..7c514b1010 100644
--- a/cpp/examples/qmf-agent/example.cpp
+++ b/cpp/examples/qmf-agent/example.cpp
@@ -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>
-- 
cgit v1.2.1