Backed out makefile-dependency changes. They break vpath builds

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

2 files changed, 8 insertions, 12 deletions

diff --git a/cpp/managementgen/qmf-gen b/cpp/managementgen/qmf-gen
index a1d76ae234..523579fe6c 100755
--- a/cpp/managementgen/qmf-gen
+++ b/cpp/managementgen/qmf-gen
@@ -54,7 +54,7 @@ if len(args) == 0:
 for schemafile in args:
   package = SchemaPackage (typefile, schemafile, opts)
 
-  gen.setPackage      (package.packageName, schemafile)
+  gen.setPackage      (package.packageName)
   gen.makeClassFiles  ("Class.h",     package)
   gen.makeClassFiles  ("Class.cpp",   package)
   gen.makeMethodFiles ("Args.h",      package)
diff --git a/cpp/managementgen/qmf/generate.py b/cpp/managementgen/qmf/generate.py
index 31154db864..7346200a28 100755
--- a/cpp/managementgen/qmf/generate.py
+++ b/cpp/managementgen/qmf/generate.py
@@ -100,11 +100,10 @@ class Template:
 
 class Makefile:
   """ Object representing a makefile fragment """
-  def __init__ (self, filelists, templateFiles, packagelist, inputList):
+  def __init__ (self, filelists, templateFiles, packagelist):
     self.filelists     = filelists
     self.templateFiles = templateFiles
     self.packagelist   = packagelist
-    self.inputList     = inputList
 
   def genGenSources (self, stream, variables):
     mdir = variables["mgenDir"]
@@ -113,16 +112,15 @@ class Makefile:
     stream.write ("    " + mdir + "/qmf/generate.py \\\n")
     stream.write ("    " + mdir + "/qmf/schema.py \\\n")
     stream.write ("    " + mdir + "/qmf/management-types.xml \\\n")
+    stream.write ("    " + sdir + "/management-schema.xml \\\n")
     first = True
     for template in self.templateFiles:
       if first:
         first = False
-        stream.write("    ")
+        stream.write ("    ")
       else:
-        stream.write(" \\\n    ")
-      stream.write(mdir + "/qmf/templates/" + template)
-    for input in self.inputList:
-      stream.write(" \\\n    $(srcdir)/" + input)
+        stream.write (" \\\n    ")
+      stream.write (mdir + "/qmf/templates/" + template)
 
   def genGenCppFiles (self, stream, variables):
     first = True
@@ -194,12 +192,10 @@ class Generator:
     self.filelists["cpp"] = []
     self.filelists["mk"]  = []
     self.packagelist      = []
-    self.inputList        = []
     self.templateFiles    = []
     self.variables        = {}
 
-  def setPackage (self, packageName, schemaFile):
-    self.inputList.append(schemaFile)
+  def setPackage (self, packageName):
     path = "/".join(packageName.split("."))
     self.packagelist.append(path)
     self.packagePath = self.normalize(self.dest + path)
@@ -320,7 +316,7 @@ class Generator:
 
   def makeSingleFile (self, templateFile, target, force=False):
     """ Generate a single expanded template """
-    makefile = Makefile (self.filelists, self.templateFiles, self.packagelist, self.inputList)
+    makefile = Makefile (self.filelists, self.templateFiles, self.packagelist)
     template = Template (self.input + templateFile, self)
     self.templateFiles.append (templateFile)
     stream = template.expand (makefile)