10 files changed, 28 insertions, 28 deletions
diff --git a/src/progs/direct/base/Makefile.am b/src/progs/direct/base/Makefile.am
index 99070fe..fe2c47c 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 = direct_data.cpp
+libdirectprog_la_DEPENDENCIES = $(srcdir)/direct_data.cpp
 
 noinst_DATA = direct.xml
-direct_data.cpp: ../xml/xml_direct_parser direct.xml
-	../xml/xml_direct_parser
+$(srcdir)/direct_data.cpp: ../xml/xml_direct_parser direct.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_direct_parser
 CLEANFILES = direct_data.cpp
diff --git a/src/progs/icd1/base/Makefile.am b/src/progs/icd1/base/Makefile.am
index 3795dc5..d289cc6 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 = icd1_data.cpp
+libicd1_la_DEPENDENCIES = $(srcdir)/icd1_data.cpp
 
 noinst_DATA = icd1.xml
-icd1_data.cpp: ../xml/xml_icd1_parser icd1.xml
-	../xml/xml_icd1_parser
+$(srcdir)/icd1_data.cpp: ../xml/xml_icd1_parser icd1.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_icd1_parser
 CLEANFILES = icd1_data.cpp
diff --git a/src/progs/icd2/base/Makefile.am b/src/progs/icd2/base/Makefile.am
index 9350219..d6c850b 100644
--- a/src/progs/icd2/base/Makefile.am
+++ b/src/progs/icd2/base/Makefile.am
@@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libicd2.la
 libicd2_la_SOURCES = microchip.cpp icd2.cpp icd2_prog.cpp icd2_serial.cpp \
 		icd2_usb.cpp icd2_usb_firmware.cpp icd2_data.cpp icd2_debug.cpp icd.cpp \
 		icd_prog.cpp icd2_debug_specific.cpp
-libicd2_la_DEPENDENCIES = icd2_data.cpp
+libicd2_la_DEPENDENCIES = $(srcdir)/icd2_data.cpp
 
 noinst_DATA = icd2.xml
-icd2_data.cpp: ../xml/xml_icd2_parser icd2.xml
-	../xml/xml_icd2_parser
+$(srcdir)/icd2_data.cpp: ../xml/xml_icd2_parser icd2.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_icd2_parser
 CLEANFILES = icd2_data.cpp
diff --git a/src/progs/picdem_bootloader/base/Makefile.am b/src/progs/picdem_bootloader/base/Makefile.am
index 13a3add..b8e4ae7 100644
--- a/src/progs/picdem_bootloader/base/Makefile.am
+++ b/src/progs/picdem_bootloader/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpicdembootloader.la
 libpicdembootloader_la_SOURCES = picdem_bootloader_data.cpp picdem_bootloader.cpp picdem_bootloader_prog.cpp
-libpicdembootloader_la_DEPENDENCIES = picdem_bootloader_data.cpp
+libpicdembootloader_la_DEPENDENCIES = $(srcdir)/picdem_bootloader_data.cpp
 
 noinst_DATA = picdem_bootloader.xml
-picdem_bootloader_data.cpp: ../xml/xml_picdem_bootloader_parser picdem_bootloader.xml
-	../xml/xml_picdem_bootloader_parser
+$(srcdir)/picdem_bootloader_data.cpp: ../xml/xml_picdem_bootloader_parser picdem_bootloader.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_picdem_bootloader_parser
 CLEANFILES = picdem_bootloader_data.cpp
diff --git a/src/progs/pickit1/base/Makefile.am b/src/progs/pickit1/base/Makefile.am
index 74d56f0..b56cb72 100644
--- a/src/progs/pickit1/base/Makefile.am
+++ b/src/progs/pickit1/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpickit1.la
 libpickit1_la_SOURCES = pickit1.cpp pickit1_prog.cpp pickit1_data.cpp
-libpickit1_la_DEPENDENCIES = pickit1_data.cpp
+libpickit1_la_DEPENDENCIES = $(srcdir)/pickit1_data.cpp
 
 noinst_DATA = pickit1.xml
-pickit1_data.cpp: ../xml/xml_pickit1_parser pickit1.xml
-	../xml/xml_pickit1_parser
+$(srcdir)/pickit1_data.cpp: ../xml/xml_pickit1_parser pickit1.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit1_parser
 CLEANFILES = pickit1_data.cpp
diff --git a/src/progs/pickit2/base/Makefile.am b/src/progs/pickit2/base/Makefile.am
index a436012..4ff664e 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 = pickit2_data.cpp
+libpickit2_la_DEPENDENCIES = $(srcdir)/pickit2_data.cpp
 
 noinst_DATA = pickit2.xml
-pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml
-	../xml/xml_pickit2_parser
+$(srcdir)/pickit2_data.cpp: ../xml/xml_pickit2_parser pickit2.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit2_parser
 CLEANFILES = pickit2_data.cpp
diff --git a/src/progs/pickit2_bootloader/base/Makefile.am b/src/progs/pickit2_bootloader/base/Makefile.am
index db87222..514882a 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 = pickit2_bootloader_data.cpp
+libpickit2bootloader_la_DEPENDENCIES = $(srcdir)/pickit2_bootloader_data.cpp
 
 noinst_DATA = pickit2_bootloader.xml
-pickit2_bootloader_data.cpp: ../xml/xml_pickit2_bootloader_parser pickit2_bootloader.xml
-	../xml/xml_pickit2_bootloader_parser
+$(srcdir)/pickit2_bootloader_data.cpp: ../xml/xml_pickit2_bootloader_parser pickit2_bootloader.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_pickit2_bootloader_parser
 CLEANFILES = pickit2_bootloader_data.cpp
diff --git a/src/progs/psp/base/Makefile.am b/src/progs/psp/base/Makefile.am
index 93ce348..4264171 100644
--- a/src/progs/psp/base/Makefile.am
+++ b/src/progs/psp/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libpsp.la
 libpsp_la_SOURCES = psp_prog.cpp psp_serial.cpp psp_data.cpp psp.cpp
-libpsp_la_DEPENDENCIES = psp_data.cpp
+libpsp_la_DEPENDENCIES = $(srcdir)/psp_data.cpp
 
 noinst_DATA = psp.xml
-psp_data.cpp: ../xml/xml_psp_parser psp.xml
-	../xml/xml_psp_parser
+$(srcdir)/psp_data.cpp: ../xml/xml_psp_parser psp.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_psp_parser
 CLEANFILES = psp_data.cpp
diff --git a/src/progs/tbl_bootloader/base/Makefile.am b/src/progs/tbl_bootloader/base/Makefile.am
index 60b11bc..cd3cb7c 100644
--- a/src/progs/tbl_bootloader/base/Makefile.am
+++ b/src/progs/tbl_bootloader/base/Makefile.am
@@ -3,9 +3,9 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libtblbootloader.la
 libtblbootloader_la_SOURCES = tbl_bootloader_data.cpp tbl_bootloader.cpp tbl_bootloader_prog.cpp
-libtblbootloader_la_DEPENDENCIES = tbl_bootloader_data.cpp
+libtblbootloader_la_DEPENDENCIES = $(srcdir)/tbl_bootloader_data.cpp
 
 noinst_DATA = tbl_bootloader.xml
-tbl_bootloader_data.cpp: ../xml/xml_tbl_bootloader_parser tbl_bootloader.xml
-	../xml/xml_tbl_bootloader_parser
+$(srcdir)/tbl_bootloader_data.cpp: ../xml/xml_tbl_bootloader_parser tbl_bootloader.xml
+	cd $(srcdir) && $(abs_builddir)/../xml/xml_tbl_bootloader_parser
 CLEANFILES = tbl_bootloader_data.cpp
diff --git a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h
index e12564f..047d008 100644
--- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h
+++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #ifndef TBL_BOOTLOADER_UI_H
-#define TBL8BOOTLOADER_UI_H
+#define TBL_BOOTLOADER_UI_H
 
 #include <kcombobox.h>
 #include <knuminput.h>