summaryrefslogtreecommitdiffstats
path: root/src/progs/pickit2_bootloader
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/pickit2_bootloader')
-rw-r--r--src/progs/pickit2_bootloader/base/Makefile.am6
-rw-r--r--src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp2
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);