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 <[email protected]>

18 files changed, 36 insertions, 36 deletions

diff --git a/src/progs/direct/base/Makefile.am b/src/progs/direct/base/Makefile.am
index fe2c47c..680fb31 100644
--- a/src/progs/direct/base/Makefile.am
+++ b/src/progs/direct/base/Makefile.am
@@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libdirectprog.la
 libdirectprog_la_SOURCES = direct_pic.cpp direct_baseline.cpp direct_16.cpp \
 	direct_16F.cpp direct_18.cpp direct_18F.cpp direct_prog.cpp direct_prog_config.cpp \
 	direct_data.cpp direct_mem24.cpp direct.cpp
-libdirectprog_la_DEPENDENCIES = $(srcdir)/direct_data.cpp
+libdirectprog_la_DEPENDENCIES = direct_data.cpp
 
 noinst_DATA = direct.xml
-$(srcdir)/direct_data.cpp: ../xml/xml_direct_parser direct.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_direct_parser
+direct_data.cpp: ../xml/xml_direct_parser direct.xml
+	cd $(abs_builddir) && ./../xml/xml_direct_parser $(srcdir)
 CLEANFILES = direct_data.cpp
diff --git a/src/progs/direct/xml/xml_direct_parser.cpp b/src/progs/direct/xml/xml_direct_parser.cpp
index 2625f9e..728845f 100644
--- a/src/progs/direct/xml/xml_direct_parser.cpp
+++ b/src/progs/direct/xml/xml_direct_parser.cpp
@@ -15,7 +15,7 @@ namespace Direct
 class XmlToData : public ::Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : ::Programmer::XmlToData<Data>("direct", "Direct") {}
+  XmlToData(const TQString &folder) : ::Programmer::XmlToData<Data>(folder, "direct", "Direct") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
diff --git a/src/progs/icd1/base/Makefile.am b/src/progs/icd1/base/Makefile.am
index d289cc6..bd74b6a 100644
--- a/src/progs/icd1/base/Makefile.am
+++ b/src/progs/icd1/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libicd1.la
 libicd1_la_SOURCES = icd1.cpp icd1_prog.cpp icd1_serial.cpp icd1_data.cpp
-libicd1_la_DEPENDENCIES = $(srcdir)/icd1_data.cpp
+libicd1_la_DEPENDENCIES = icd1_data.cpp
 
 noinst_DATA = icd1.xml
-$(srcdir)/icd1_data.cpp: ../xml/xml_icd1_parser icd1.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_icd1_parser
+icd1_data.cpp: ../xml/xml_icd1_parser icd1.xml
+	cd $(abs_builddir) && ./../xml/xml_icd1_parser $(srcdir)
 CLEANFILES = icd1_data.cpp
diff --git a/src/progs/icd1/xml/xml_icd1_parser.cpp b/src/progs/icd1/xml/xml_icd1_parser.cpp
index 90d9495..8174ecd 100644
--- a/src/progs/icd1/xml/xml_icd1_parser.cpp
+++ b/src/progs/icd1/xml/xml_icd1_parser.cpp
@@ -16,7 +16,7 @@ namespace Icd1
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("icd1", "Icd1") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "icd1", "Icd1") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
diff --git a/src/progs/icd2/base/Makefile.am b/src/progs/icd2/base/Makefile.am
index d6c850b..610a7a9 100644
--- a/src/progs/icd2/base/Makefile.am
+++ b/src/progs/icd2/base/Makefile.am
@@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libicd2.la
 libicd2_la_SOURCES = microchip.cpp icd2.cpp icd2_prog.cpp icd2_serial.cpp \
 		icd2_usb.cpp icd2_usb_firmware.cpp icd2_data.cpp icd2_debug.cpp icd.cpp \
 		icd_prog.cpp icd2_debug_specific.cpp
-libicd2_la_DEPENDENCIES = $(srcdir)/icd2_data.cpp
+libicd2_la_DEPENDENCIES = icd2_data.cpp
 
 noinst_DATA = icd2.xml
-$(srcdir)/icd2_data.cpp: ../xml/xml_icd2_parser icd2.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_icd2_parser
+icd2_data.cpp: ../xml/xml_icd2_parser icd2.xml
+	cd $(abs_builddir) && ./../xml/xml_icd2_parser $(srcdir)
 CLEANFILES = icd2_data.cpp
diff --git a/src/progs/icd2/xml/xml_icd2_parser.cpp b/src/progs/icd2/xml/xml_icd2_parser.cpp
index c2af113..6ce6909 100644
--- a/src/progs/icd2/xml/xml_icd2_parser.cpp
+++ b/src/progs/icd2/xml/xml_icd2_parser.cpp
@@ -16,7 +16,7 @@ namespace Icd2
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("icd2", "Icd2") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "icd2", "Icd2") {}
 
 private:
   virtual uint familyIndex(const TQString &family) const;
diff --git a/src/progs/picdem_bootloader/base/Makefile.am b/src/progs/picdem_bootloader/base/Makefile.am
index b8e4ae7..e76e21a 100644
--- a/src/progs/picdem_bootloader/base/Makefile.am
+++ b/src/progs/picdem_bootloader/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpicdembootloader.la
 libpicdembootloader_la_SOURCES = picdem_bootloader_data.cpp picdem_bootloader.cpp picdem_bootloader_prog.cpp
-libpicdembootloader_la_DEPENDENCIES = $(srcdir)/picdem_bootloader_data.cpp
+libpicdembootloader_la_DEPENDENCIES = picdem_bootloader_data.cpp
 
 noinst_DATA = picdem_bootloader.xml
-$(srcdir)/picdem_bootloader_data.cpp: ../xml/xml_picdem_bootloader_parser picdem_bootloader.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_picdem_bootloader_parser
+picdem_bootloader_data.cpp: ../xml/xml_picdem_bootloader_parser picdem_bootloader.xml
+	cd $(abs_builddir) && ./../xml/xml_picdem_bootloader_parser $(srcdir)
 CLEANFILES = picdem_bootloader_data.cpp
diff --git a/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp b/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp
index 2562f1d..f79e454 100644
--- a/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp
+++ b/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp
@@ -19,7 +19,7 @@ namespace PicdemBootloader
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("picdem_bootloader", "PicdemBootloader") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "picdem_bootloader", "PicdemBootloader") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
diff --git a/src/progs/pickit1/base/Makefile.am b/src/progs/pickit1/base/Makefile.am
index b56cb72..2ae3747 100644
--- a/src/progs/pickit1/base/Makefile.am
+++ b/src/progs/pickit1/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpickit1.la
 libpickit1_la_SOURCES = pickit1.cpp pickit1_prog.cpp pickit1_data.cpp
-libpickit1_la_DEPENDENCIES = $(srcdir)/pickit1_data.cpp
+libpickit1_la_DEPENDENCIES = pickit1_data.cpp
 
 noinst_DATA = pickit1.xml
-$(srcdir)/pickit1_data.cpp: ../xml/xml_pickit1_parser pickit1.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit1_parser
+pickit1_data.cpp: ../xml/xml_pickit1_parser pickit1.xml
+	cd $(abs_builddir) && ./../xml/xml_pickit1_parser $(srcdir)
 CLEANFILES = pickit1_data.cpp
diff --git a/src/progs/pickit1/xml/xml_pickit1_parser.cpp b/src/progs/pickit1/xml/xml_pickit1_parser.cpp
index 1fd09cf..9179652 100644
--- a/src/progs/pickit1/xml/xml_pickit1_parser.cpp
+++ b/src/progs/pickit1/xml/xml_pickit1_parser.cpp
@@ -15,7 +15,7 @@ namespace Pickit1
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("pickit1", "Pickit1") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "pickit1", "Pickit1") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
diff --git a/src/progs/pickit2/base/Makefile.am b/src/progs/pickit2/base/Makefile.am
index 4ff664e..adfdfb5 100644
--- a/src/progs/pickit2/base/Makefile.am
+++ b/src/progs/pickit2/base/Makefile.am
@@ -4,9 +4,9 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libpickit2.la
 libpickit2_la_SOURCES = pickit2_data.cpp pickit.cpp pickit_prog.cpp \
 	pickit2.cpp pickit2_prog.cpp
-libpickit2_la_DEPENDENCIES = $(srcdir)/pickit2_data.cpp
+libpickit2_la_DEPENDENCIES = pickit2_data.cpp
 
 noinst_DATA = pickit2.xml
-$(srcdir)/pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit2_parser
+pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml
+	cd $(abs_builddir) && ./../xml/xml_pickit2_parser $(srcdir)
 CLEANFILES = pickit2_data.cpp
diff --git a/src/progs/pickit2/xml/xml_pickit2_parser.cpp b/src/progs/pickit2/xml/xml_pickit2_parser.cpp
index fb0543a..464dee9 100644
--- a/src/progs/pickit2/xml/xml_pickit2_parser.cpp
+++ b/src/progs/pickit2/xml/xml_pickit2_parser.cpp
@@ -15,7 +15,7 @@ namespace Pickit2
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("pickit2", "Pickit2") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "pickit2", "Pickit2") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
diff --git a/src/progs/pickit2_bootloader/base/Makefile.am b/src/progs/pickit2_bootloader/base/Makefile.am
index 514882a..ed36216 100644
--- a/src/progs/pickit2_bootloader/base/Makefile.am
+++ b/src/progs/pickit2_bootloader/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpickit2bootloader.la
 libpickit2bootloader_la_SOURCES = pickit2_bootloader_data.cpp pickit2_bootloader_prog.cpp pickit2_bootloader.cpp
-libpickit2bootloader_la_DEPENDENCIES = $(srcdir)/pickit2_bootloader_data.cpp
+libpickit2bootloader_la_DEPENDENCIES = pickit2_bootloader_data.cpp
 
 noinst_DATA = pickit2_bootloader.xml
-$(srcdir)/pickit2_bootloader_data.cpp: ../xml/xml_pickit2_bootloader_parser pickit2_bootloader.xml
-	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit2_bootloader_parser
+pickit2_bootloader_data.cpp: ../xml/xml_pickit2_bootloader_parser pickit2_bootloader.xml
+	cd $(abs_builddir) && ./../xml/xml_pickit2_bootloader_parser $(srcdir)
 CLEANFILES = pickit2_bootloader_data.cpp
diff --git a/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp b/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp
index 00c33ed..022f2a1 100644
--- a/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp
+++ b/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp
@@ -19,7 +19,7 @@ namespace Pickit2Bootloader
 class XmlToData : public Programmer::XmlToData<Data>
 {
 public:
-  XmlToData() : Programmer::XmlToData<Data>("pickit2_bootloader", "Pickit2Bootloader") {}
+  XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "pickit2_bootloader", "Pickit2Bootloader") {}
 
 private:
   virtual void parseData(TQDomElement element, Data &data);
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);
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);