summaryrefslogtreecommitdiffstats
path: root/src/progs/direct
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/direct')
-rw-r--r--src/progs/direct/base/Makefile.am6
-rw-r--r--src/progs/direct/xml/xml_direct_parser.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/direct/base/Makefile.am b/src/progs/direct/base/Makefile.am
index fe2c47c..680fb31 100644
--- a/src/progs/direct/base/Makefile.am
+++ b/src/progs/direct/base/Makefile.am
@@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libdirectprog.la
libdirectprog_la_SOURCES = direct_pic.cpp direct_baseline.cpp direct_16.cpp \
direct_16F.cpp direct_18.cpp direct_18F.cpp direct_prog.cpp direct_prog_config.cpp \
direct_data.cpp direct_mem24.cpp direct.cpp
-libdirectprog_la_DEPENDENCIES = $(srcdir)/direct_data.cpp
+libdirectprog_la_DEPENDENCIES = direct_data.cpp
noinst_DATA = direct.xml
-$(srcdir)/direct_data.cpp: ../xml/xml_direct_parser direct.xml
- cd $(srcdir) && $(abs_builddir)/../xml/xml_direct_parser
+direct_data.cpp: ../xml/xml_direct_parser direct.xml
+ cd $(abs_builddir) && ./../xml/xml_direct_parser $(srcdir)
CLEANFILES = direct_data.cpp
diff --git a/src/progs/direct/xml/xml_direct_parser.cpp b/src/progs/direct/xml/xml_direct_parser.cpp
index 2625f9e..728845f 100644
--- a/src/progs/direct/xml/xml_direct_parser.cpp
+++ b/src/progs/direct/xml/xml_direct_parser.cpp
@@ -15,7 +15,7 @@ namespace Direct
class XmlToData : public ::Programmer::XmlToData<Data>
{
public:
- XmlToData() : ::Programmer::XmlToData<Data>("direct", "Direct") {}
+ XmlToData(const TQString &folder) : ::Programmer::XmlToData<Data>(folder, "direct", "Direct") {}
private:
virtual void parseData(TQDomElement element, Data &data);