diff options
Diffstat (limited to 'src/progs/pickit2')
-rw-r--r-- | src/progs/pickit2/base/Makefile.am | 6 | ||||
-rw-r--r-- | src/progs/pickit2/xml/xml_pickit2_parser.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/pickit2/base/Makefile.am b/src/progs/pickit2/base/Makefile.am index 4ff664e..adfdfb5 100644 --- a/src/progs/pickit2/base/Makefile.am +++ b/src/progs/pickit2/base/Makefile.am @@ -4,9 +4,9 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libpickit2.la libpickit2_la_SOURCES = pickit2_data.cpp pickit.cpp pickit_prog.cpp \ pickit2.cpp pickit2_prog.cpp -libpickit2_la_DEPENDENCIES = $(srcdir)/pickit2_data.cpp +libpickit2_la_DEPENDENCIES = pickit2_data.cpp noinst_DATA = pickit2.xml -$(srcdir)/pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml - cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit2_parser +pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml + cd $(abs_builddir) && ./../xml/xml_pickit2_parser $(srcdir) CLEANFILES = pickit2_data.cpp diff --git a/src/progs/pickit2/xml/xml_pickit2_parser.cpp b/src/progs/pickit2/xml/xml_pickit2_parser.cpp index fb0543a..464dee9 100644 --- a/src/progs/pickit2/xml/xml_pickit2_parser.cpp +++ b/src/progs/pickit2/xml/xml_pickit2_parser.cpp @@ -15,7 +15,7 @@ namespace Pickit2 class XmlToData : public Programmer::XmlToData<Data> { public: - XmlToData() : Programmer::XmlToData<Data>("pickit2", "Pickit2") {} + XmlToData(const TQString &folder) : Programmer::XmlToData<Data>(folder, "pickit2", "Pickit2") {} private: virtual void parseData(TQDomElement element, Data &data); |