Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 9 insertions, 9 deletions

diff --git a/src/piklab-coff/Makefile.am b/src/piklab-coff/Makefile.am
index 5884f43..56944c6 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_KIO)
-piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 piklab_coff_SOURCES = main.cpp
diff --git a/src/piklab-hex/Makefile.am b/src/piklab-hex/Makefile.am
index b7ccf7e..ebed35f 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_KIO)
-piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 piklab_hex_SOURCES = main.cpp
diff --git a/src/piklab-prog/Makefile.am b/src/piklab-prog/Makefile.am
index fd53ef0..f90dac3 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_KIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS)
-piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp
diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am
index 209e3e3..11514a6 100644
--- a/src/piklab-test/generators/Makefile.am
+++ b/src/piklab-test/generators/Makefile.am
@@ -17,15 +17,15 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
 
 gputils_config_generator_check_DEPENDENCIES = $(OBJ)
 gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp
 
 gputils_template_generator_check_DEPENDENCIES = $(OBJ)
 gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
 
 sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
 sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO)
-sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 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 e21c3d1..00bf292 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_KIO)
-misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 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 da9365f..96c839d 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_KIO)
-save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 save_load_memory_check_SOURCES = save_load_memory_check.cpp
diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am
index 4a40a10..c591503 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) -lktexteditor $(LIBUSB_LIBS) $(LIB_KHTML)
 piklab_DEPENDENCIES = $(OBJS)
-piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 piklab_SOURCES = main.cpp