From 98ccfb855bfd53a3b29d0925844f2d7c938e50b8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:20:38 +0900 Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- src/data/Makefile.am | 2 +- src/piklab-coff/Makefile.am | 2 +- src/piklab-hex/Makefile.am | 2 +- src/piklab-prog/Makefile.am | 2 +- src/piklab-test/checksum/Makefile.am | 2 +- src/piklab-test/generators/Makefile.am | 6 +++--- src/piklab-test/misc/Makefile.am | 2 +- src/piklab-test/save_load_memory/Makefile.am | 2 +- src/piklab/Makefile.am | 2 +- src/xml_to_data/Makefile.am | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/data/Makefile.am b/src/data/Makefile.am index e900930..a3469ec 100644 --- a/src/data/Makefile.am +++ b/src/data/Makefile.am @@ -9,7 +9,7 @@ syntaxkate_DATA = asm-pic.xml coff-pic.xml jal-pic.xml coff-c-pic.xml noinst_PROGRAMS = syntax_xml_generator syntax_xml_generator_SOURCES = syntax_xml_generator.cpp -syntax_xml_generator_LDADD = $(LIB_QT) +syntax_xml_generator_LDADD = $(LIB_TQT) syntax_xml_generator_LDFLAGS = $(all_libraries) asm-pic.xml coff-pic.xml: syntax_xml_generator diff --git a/src/piklab-coff/Makefile.am b/src/piklab-coff/Makefile.am index ff2e8f5..dd7a2ab 100644 --- a/src/piklab-coff/Makefile.am +++ b/src/piklab-coff/Makefile.am @@ -12,5 +12,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la piklab_coff_DEPENDENCIES = $(OBJ) piklab_coff_LDADD = $(OBJ) $(LIB_TDEIO) -piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_coff_SOURCES = main.cpp diff --git a/src/piklab-hex/Makefile.am b/src/piklab-hex/Makefile.am index a071a5e..e229a83 100644 --- a/src/piklab-hex/Makefile.am +++ b/src/piklab-hex/Makefile.am @@ -11,5 +11,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la piklab_hex_DEPENDENCIES = $(OBJ) piklab_hex_LDADD = $(OBJ) $(LIB_TDEIO) -piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_hex_SOURCES = main.cpp diff --git a/src/piklab-prog/Makefile.am b/src/piklab-prog/Makefile.am index 23430a6..8d0e0ef 100644 --- a/src/piklab-prog/Makefile.am +++ b/src/piklab-prog/Makefile.am @@ -27,5 +27,5 @@ OBJ = $(top_builddir)/src/progs/list/libproglistnoui.la \ $(top_builddir)/src/common/common/libcommon.la piklab_prog_DEPENDENCIES = $(OBJ) piklab_prog_LDADD = $(OBJ) $(LIB_TDEIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS) -piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp diff --git a/src/piklab-test/checksum/Makefile.am b/src/piklab-test/checksum/Makefile.am index 984dca6..ae4c043 100644 --- a/src/piklab-test/checksum/Makefile.am +++ b/src/piklab-test/checksum/Makefile.am @@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la checksum_check_DEPENDENCIES = $(OBJ) checksum_check_LDADD = $(OBJ) $(LIB_TDEIO) -checksum_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) +checksum_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) checksum_check_SOURCES = checksum_check.cpp diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am index d7495cb..d7c495c 100644 --- a/src/piklab-test/generators/Makefile.am +++ b/src/piklab-test/generators/Makefile.am @@ -16,16 +16,16 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la gputils_config_generator_check_DEPENDENCIES = $(OBJ) -gputils_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +gputils_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_TQT) gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp gputils_template_generator_check_DEPENDENCIES = $(OBJ) -gputils_template_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +gputils_template_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_TQT) gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp sdcc_config_generator_check_DEPENDENCIES = $(OBJ) -sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_TQT) sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp diff --git a/src/piklab-test/misc/Makefile.am b/src/piklab-test/misc/Makefile.am index 0f7b121..05bf5c3 100644 --- a/src/piklab-test/misc/Makefile.am +++ b/src/piklab-test/misc/Makefile.am @@ -6,5 +6,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common $(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la misc_check_DEPENDENCIES = $(OBJ) misc_check_LDADD = $(OBJ) $(LIB_TDEIO) -misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor misc_check_SOURCES = misc_check.cpp diff --git a/src/piklab-test/save_load_memory/Makefile.am b/src/piklab-test/save_load_memory/Makefile.am index 36c27c5..08e7cad 100644 --- a/src/piklab-test/save_load_memory/Makefile.am +++ b/src/piklab-test/save_load_memory/Makefile.am @@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la save_load_memory_check_DEPENDENCIES = $(OBJ) save_load_memory_check_LDADD = $(OBJ) $(LIB_TDEIO) -save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor save_load_memory_check_SOURCES = save_load_memory_check.cpp diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am index 5925561..c8d0fac 100644 --- a/src/piklab/Makefile.am +++ b/src/piklab/Makefile.am @@ -59,5 +59,5 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TDEIO) piklab_DEPENDENCIES = $(OBJS) -piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) piklab_SOURCES = main.cpp diff --git a/src/xml_to_data/Makefile.am b/src/xml_to_data/Makefile.am index 5b8ba1c..29bc32c 100644 --- a/src/xml_to_data/Makefile.am +++ b/src/xml_to_data/Makefile.am @@ -4,4 +4,4 @@ METASOURCES = AUTO libxmltodata_la_LDFLAGS = $(all_libraries) noinst_LTLIBRARIES = libxmltodata.la libxmltodata_la_SOURCES = xml_to_data.cpp device_xml_to_data.cpp -libxmltodata_la_LIBADD = $(LIB_QT) +libxmltodata_la_LIBADD = $(LIB_TQT) -- cgit v1.2.3