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>
(cherry picked from commit ac3f0014232619edc41865f6e42e6510bdd8acc6)

2 files changed, 4 insertions, 4 deletions

diff --git a/src/progs/psp/base/Makefile.am b/src/progs/psp/base/Makefile.am
index 4264171..ed73590 100644
--- a/src/progs/psp/base/Makefile.am
+++ b/src/progs/psp/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpsp.la
 libpsp_la_SOURCES = psp_prog.cpp psp_serial.cpp psp_data.cpp psp.cpp
-libpsp_la_DEPENDENCIES = $(srcdir)/psp_data.cpp
+libpsp_la_DEPENDENCIES = psp_data.cpp
 
 noinst_DATA = psp.xml
-$(srcdir)/psp_data.cpp: ../xml/xml_psp_parser psp.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_psp_parser
+psp_data.cpp: ../xml/xml_psp_parser psp.xml
+	cd $(abs_builddir) && ./../xml/xml_psp_parser $(srcdir)
 CLEANFILES = psp_data.cpp
diff --git a/src/progs/psp/xml/xml_psp_parser.cpp b/src/progs/psp/xml/xml_psp_parser.cpp
index d2d4aff..5c53973 100644
--- a/src/progs/psp/xml/xml_psp_parser.cpp
+++ b/src/progs/psp/xml/xml_psp_parser.cpp
@@ -16,7 +16,7 @@ namespace Psp
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("psp", "Psp") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "psp", "Psp") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);