Allow generation of build time data files in out-of-source builds. Also fix generation of data file for devices/mem24 subfolder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/coff/base/Makefile.am b/src/coff/base/Makefile.am
index 83ca6dd..399bf12 100644
--- a/src/coff/base/Makefile.am
+++ b/src/coff/base/Makefile.am
@@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libcoff.la
 libcoff_la_LDFLAGS = $(all_libraries)
 libcoff_la_SOURCES = coff.cpp gpdis.cpp gpopcode.cpp disassembler.cpp \
 		coff_data.cpp text_coff.cpp cdb_parser.cpp coff_archive.cpp coff_object.cpp
-libcoff_la_DEPENDENCIES = $(srcdir)/coff_data.cpp
+libcoff_la_DEPENDENCIES = coff_data.cpp
 
 noinst_DATA = coff.xml
-$(srcdir)/coff_data.cpp: ../xml/xml_coff_parser coff.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_coff_parser
+coff_data.cpp: ../xml/xml_coff_parser coff.xml
+	cd $(abs_builddir) && ./../xml/xml_coff_parser $(srcdir)
 CLEANFILES = coff_data.cpp
diff --git a/src/coff/xml/xml_coff_parser.cpp b/src/coff/xml/xml_coff_parser.cpp
index 9b915bf..862aeeb 100644
--- a/src/coff/xml/xml_coff_parser.cpp
+++ b/src/coff/xml/xml_coff_parser.cpp
@@ -21,7 +21,7 @@ namespace Coff
 class XmlToData : public ExtXmlToData<Data>
 {
 public:
-  XmlToData() : ExtXmlToData<Data>("coff", "Coff") {}
+  XmlToData(const TQString &folder) : ExtXmlToData<Data>(folder, "coff", "Coff") {}
 
 private:
   TQMap<uint, bool> _ids;