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