diff options
| author | Michele Calgaro <[email protected]> | 2024-05-06 18:26:24 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-05-07 11:02:46 +0900 |
| commit | 014e4b95648f2b8e7deb57acb0cdd8cefc363477 (patch) | |
| tree | 02ced501daff512fed5126427f57eca6c2ef3630 /src/progs/icd2 | |
| parent | f2e2d9a5271aa9cfd966592d50f60d5b5bf550f4 (diff) | |
| download | piklab-014e4b95648f2b8e7deb57acb0cdd8cefc363477.tar.gz piklab-014e4b95648f2b8e7deb57acb0cdd8cefc363477.zip | |
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]>
(cherry picked from commit ac3f0014232619edc41865f6e42e6510bdd8acc6)
Diffstat (limited to 'src/progs/icd2')
| -rw-r--r-- | src/progs/icd2/base/Makefile.am | 6 | ||||
| -rw-r--r-- | src/progs/icd2/xml/xml_icd2_parser.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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; |