Separate generated public header files from non-public headers, generated code re-organization.

The gen/ directory has been removed, code is now generated into:
 $(builddir)/src - all .cpp files and non-public .h files.
 $(builddir)/include - all public .h files.

The gen/ directory was originally intended to separate generated code
from hand-written code.  However both automake and cmake allow you to
direct all build output, including generated code, into a separate
build directory. In fact both recommend you build this way. 

Keeping the gen/ directory meant there would have been a total of 8
places to look for header files, all the combinations of
builddir/srcdir, src/include and gen/no-gen. This was a mess, 4 is bad
enough.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/qpid/cpp/managementgen/qmfgen/generate.py b/qpid/cpp/managementgen/qmfgen/generate.py
index 44c434216e..4052b8c853 100755
--- a/qpid/cpp/managementgen/qmfgen/generate.py
+++ b/qpid/cpp/managementgen/qmfgen/generate.py
@@ -163,7 +163,7 @@ class Makefile:
       stream.write("dist_" + name + "_HEADERS = ")
       first = True
       for file in self.filelists["h"]:
-        if file.find("gen/qmf/" + package) == 0:
+        if file.find("qmf/" + package) == 0:
           if first:
             first = False
           else:
@@ -243,7 +243,7 @@ class CMakeLists(Makefile):
       first = True
       for file in self.filelists["h"]:
         file = self.unNormCase(file)
-        if file.find("gen/qmf/" + package) == 0:
+        if file.find("qmf/" + package) == 0:
           if first:
             first = False
           else: