From 9f4064c1e558a946ea30ab93bd132745abe80a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 1 May 2016 12:25:28 +0200 Subject: [PATCH] Fix build out-of-source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/coff/base/Makefile.am | 6 +++--- src/common/global/svn_revision/Makefile.am | 2 +- src/devices/pic/xml_data/Makefile.am | 6 +++--- src/progs/direct/base/Makefile.am | 6 +++--- src/progs/icd1/base/Makefile.am | 6 +++--- src/progs/icd2/base/Makefile.am | 6 +++--- src/progs/picdem_bootloader/base/Makefile.am | 6 +++--- src/progs/pickit1/base/Makefile.am | 6 +++--- src/progs/pickit2/base/Makefile.am | 6 +++--- src/progs/pickit2_bootloader/base/Makefile.am | 6 +++--- src/progs/psp/base/Makefile.am | 6 +++--- src/progs/tbl_bootloader/base/Makefile.am | 6 +++--- src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h | 2 +- src/xml_to_data/Makefile.am | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/coff/base/Makefile.am b/src/coff/base/Makefile.am index c6ffbab..83ca6dd 100644 --- a/src/coff/base/Makefile.am +++ b/src/coff/base/Makefile.am @@ -5,9 +5,9 @@ noinst_LTLIBRARIES = libcoff.la libcoff_la_LDFLAGS = $(all_libraries) libcoff_la_SOURCES = coff.cpp gpdis.cpp gpopcode.cpp disassembler.cpp \ coff_data.cpp text_coff.cpp cdb_parser.cpp coff_archive.cpp coff_object.cpp -libcoff_la_DEPENDENCIES = coff_data.cpp +libcoff_la_DEPENDENCIES = $(srcdir)/coff_data.cpp noinst_DATA = coff.xml -coff_data.cpp: ../xml/xml_coff_parser coff.xml - ../xml/xml_coff_parser +$(srcdir)/coff_data.cpp: ../xml/xml_coff_parser coff.xml + cd $(srcdir) && $(abs_builddir)/../xml/xml_coff_parser CLEANFILES = coff_data.cpp diff --git a/src/common/global/svn_revision/Makefile.am b/src/common/global/svn_revision/Makefile.am index f3d4ee4..b6f7fb2 100644 --- a/src/common/global/svn_revision/Makefile.am +++ b/src/common/global/svn_revision/Makefile.am @@ -2,4 +2,4 @@ INCLUDES = -I$(top_srcdir)/src $(all_includes) METASOURCES = AUTO all-local: - sh svn_revision.sh + sh $(srcdir)/svn_revision.sh diff --git a/src/devices/pic/xml_data/Makefile.am b/src/devices/pic/xml_data/Makefile.am index 43b13d4..e5bd5c4 100644 --- a/src/devices/pic/xml_data/Makefile.am +++ b/src/devices/pic/xml_data/Makefile.am @@ -3,10 +3,10 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libpicxml.la libpicxml_la_SOURCES = pic_data.cpp -libpicxml_la_DEPENDENCIES = pic_data.cpp +libpicxml_la_DEPENDENCIES = $(srcdir)/pic_data.cpp include deps.mak noinst_DATA += registers/registers.xml registers/registers_missing.xml -pic_data.cpp: ../xml/pic_xml_to_data $(noinst_DATA) - ../xml/pic_xml_to_data +$(srcdir)/pic_data.cpp: ../xml/pic_xml_to_data $(noinst_DATA) + cd $(srcdir) && $(abs_builddir)/../xml/pic_xml_to_data CLEANFILES = pic_data.cpp 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 #include diff --git a/src/xml_to_data/Makefile.am b/src/xml_to_data/Makefile.am index 66985ca..5b8ba1c 100644 --- a/src/xml_to_data/Makefile.am +++ b/src/xml_to_data/Makefile.am @@ -3,5 +3,5 @@ METASOURCES = AUTO libxmltodata_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libxmltodata.la -libxmltodata_la_SOURCES = xml_to_data.cpp xml_to_data.cpp device_xml_to_data.cpp +libxmltodata_la_SOURCES = xml_to_data.cpp device_xml_to_data.cpp libxmltodata_la_LIBADD = $(LIB_QT)