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/progs/tbl_bootloader/base/Makefile.am b/src/progs/tbl_bootloader/base/Makefile.am
index cd3cb7c..e2d557b 100644
--- a/src/progs/tbl_bootloader/base/Makefile.am
+++ b/src/progs/tbl_bootloader/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libtblbootloader.la
 libtblbootloader_la_SOURCES = tbl_bootloader_data.cpp tbl_bootloader.cpp tbl_bootloader_prog.cpp
-libtblbootloader_la_DEPENDENCIES = $(srcdir)/tbl_bootloader_data.cpp
+libtblbootloader_la_DEPENDENCIES = tbl_bootloader_data.cpp
 
 noinst_DATA = tbl_bootloader.xml
-$(srcdir)/tbl_bootloader_data.cpp: ../xml/xml_tbl_bootloader_parser tbl_bootloader.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_tbl_bootloader_parser
+tbl_bootloader_data.cpp: ../xml/xml_tbl_bootloader_parser tbl_bootloader.xml
+	cd $(abs_builddir) && ./../xml/xml_tbl_bootloader_parser $(srcdir)
 CLEANFILES = tbl_bootloader_data.cpp
diff --git a/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp b/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp
index eb3087d..f0ffd4e 100644
--- a/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp
+++ b/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp
@@ -19,7 +19,7 @@ namespace TinyBootloader
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("tbl_bootloader", "TinyBootloader") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "tbl_bootloader", "TinyBootloader") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);