Remove tests/testagent sub-directory, build testagent in the tests directory.

Resolves build-order issues, more consistent with the rest of the test builds.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@920991 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 52 insertions, 56 deletions

diff --git a/cpp/configure.ac b/cpp/configure.ac
index efa38d021f..1ac3f3397e 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -534,7 +534,6 @@ AC_CONFIG_FILES([
   src/Makefile
   src/tests/Makefile
   src/tests/test_env.sh
-  src/tests/testagent/Makefile
   docs/man/Makefile
   docs/api/Makefile
   docs/api/user.doxygen
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 64853345ba..7377edc3bb 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -17,8 +17,6 @@
 # under the License.
 #
 
-SUBDIRS = . testagent
-
 AM_CXXFLAGS = $(WARNING_CFLAGS) -DBOOST_TEST_DYN_LINK
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
 PUBLIC_INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include # Use public API only
@@ -381,3 +379,5 @@ python_prep:
 		--prefix=$(PYTHON_BLD_DIR) --install-lib=$(PYTHON_BLD_DIR) \
 		--install-scripts=$(PYTHON_BLD_DIR)/commands; \
 	else echo "WARNING: python client not built, missing $(PYTHON_SRC_DIR)"; fi
+
+include testagent.mk
diff --git a/cpp/src/tests/testagent/testagent.cpp b/cpp/src/tests/testagent.cpp
index 61b47d83da..61b47d83da 100644
--- a/cpp/src/tests/testagent/testagent.cpp
+++ b/cpp/src/tests/testagent.cpp
diff --git a/cpp/src/tests/testagent.mk b/cpp/src/tests/testagent.mk
new file mode 100644
index 0000000000..6d0d93bb82
--- /dev/null
+++ b/cpp/src/tests/testagent.mk
@@ -0,0 +1,50 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Build a simple qmf agent for test purposes.
+
+QMF_GEN=$(top_srcdir)/managementgen/qmf-gen
+
+TESTAGENT_GEN_SRC=									\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Parent.h			\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Child.h				\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Parent.cpp			\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Child.cpp			\
+	testagent_gen/qmf/org/apache/qpid/agent/example/ArgsParentCreate_child.h	\
+	testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.h		\
+	testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.h		\
+	testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.cpp		\
+	testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.cpp		\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Package.h			\
+	testagent_gen/qmf/org/apache/qpid/agent/example/Package.cpp
+
+$(TESTAGENT_GEN_SRC): testagent_gen.timestamp
+
+testagent_gen.timestamp: testagent.xml
+	$(QMF_GEN) -o testagent_gen/qmf $(srcdir)/testagent.xml
+	touch testagent_gen.timestamp
+
+CLEANFILES+=$(TESTAGENT_GEN_SRC) testagent_gen.timestamp
+
+qpidtest_PROGRAMS+=testagent
+testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
+testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
+testagent_LDADD=$(top_builddir)/src/libqmf.la
+
+EXTRA_DIST+=testagent.xml
diff --git a/cpp/src/tests/testagent/schema.xml b/cpp/src/tests/testagent.xml
index 8be21b7e68..8be21b7e68 100644
--- a/cpp/src/tests/testagent/schema.xml
+++ b/cpp/src/tests/testagent.xml
diff --git a/cpp/src/tests/testagent/Makefile.am b/cpp/src/tests/testagent/Makefile.am
deleted file mode 100644
index 160d8adb57..0000000000
--- a/cpp/src/tests/testagent/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Build a simple qmf agent for test purposes.
-
-QMF_GEN=$(top_srcdir)/managementgen/qmf-gen
-GEN_SRC= \
-	gen/qmf/org/apache/qpid/agent/example/Parent.h			\
-	gen/qmf/org/apache/qpid/agent/example/Child.h			\
-	gen/qmf/org/apache/qpid/agent/example/Parent.cpp		\
-	gen/qmf/org/apache/qpid/agent/example/Child.cpp			\
-	gen/qmf/org/apache/qpid/agent/example/ArgsParentCreate_child.h	\
-	gen/qmf/org/apache/qpid/agent/example/EventChildCreated.h	\
-	gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.h	\
-	gen/qmf/org/apache/qpid/agent/example/EventChildCreated.cpp	\
-	gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.cpp	\
-	gen/qmf/org/apache/qpid/agent/example/Package.h			\
-	gen/qmf/org/apache/qpid/agent/example/Package.cpp
-
-$(GEN_SRC): gen.timestamp
-
-gen.timestamp: schema.xml
-	$(QMF_GEN) -o gen/qmf $(srcdir)/schema.xml
-	touch gen.timestamp
-
-CLEANFILES=$(GEN_SRC) gen.timestamp
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -Igen
-
-qpidexecdir = $(libexecdir)/qpid
-qpidtestdir = $(qpidexecdir)/tests
-
-qpidtest_PROGRAMS=testagent
-testagent_SOURCES=testagent.cpp $(GEN_SRC)
-testagent_LDADD=$(top_builddir)/src/libqmf.la
-
-EXTRA_DIST=schema.xml