From 014e4b95648f2b8e7deb57acb0cdd8cefc363477 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 6 May 2024 18:26:24 +0900 Subject: 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 (cherry picked from commit ac3f0014232619edc41865f6e42e6510bdd8acc6) --- src/progs/icd2/base/Makefile.am | 6 +++--- src/progs/icd2/xml/xml_icd2_parser.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/progs/icd2') 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 { public: - XmlToData() : Programmer::XmlToData("icd2", "Icd2") {} + XmlToData(const TQString &folder) : Programmer::XmlToData(folder, "icd2", "Icd2") {} private: virtual uint familyIndex(const TQString &family) const; -- cgit v1.2.1