From ac3f0014232619edc41865f6e42e6510bdd8acc6 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 --- src/progs/icd1/base/Makefile.am | 6 +++--- src/progs/icd1/xml/xml_icd1_parser.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/progs/icd1') 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 { public: - XmlToData() : Programmer::XmlToData("icd1", "Icd1") {} + XmlToData(const TQString &folder) : Programmer::XmlToData(folder, "icd1", "Icd1") {} private: virtual void parseData(TQDomElement element, Data &data); -- cgit v1.2.1