diff options
Diffstat (limited to 'karbon')
| -rw-r--r-- | karbon/Makefile.am | 8 | ||||
| -rw-r--r-- | karbon/plugins/flattenpath/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/imagetool/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/insertknots/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/roundcorners/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/shadoweffect/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/whirlpinch/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/plugins/zoomtool/Makefile.am | 2 | ||||
| -rw-r--r-- | karbon/tools/Makefile.am | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/karbon/Makefile.am b/karbon/Makefile.am index 924d7c350..8faf3972a 100644 --- a/karbon/Makefile.am +++ b/karbon/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = libkarbonpart.la libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc -libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_QT) +libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_TQT) libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \ dockers/libkarbondockers.la \ widgets/libkarbonwidgets.la \ @@ -33,14 +33,14 @@ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIBFREETYPE_LIBS) libkarbonpart_la_SOURCES = karbon_factory_init.cc -libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_QT) +libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_TQT) libkarbonpart_la_LIBADD = libkarboncommon.la bin_PROGRAMS = tdeinit_LTLIBRARIES = karbon.la karbon_la_SOURCES = main.cc -karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -karbon_la_LIBADD = libkarboncommon.la $(LIB_QT) $(LIB_KOFFICECORE) +karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_TQT) +karbon_la_LIBADD = libkarboncommon.la $(LIB_TQT) $(LIB_KOFFICECORE) noinst_HEADERS = \ karbon_factory.h \ diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am index 3686a993e..e1337a7ea 100644 --- a/karbon/plugins/flattenpath/Makefile.am +++ b/karbon/plugins/flattenpath/Makefile.am @@ -6,7 +6,7 @@ karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc karbon_flattenpathplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = flattenpathplugin.rc diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am index d2cb53e31..188656241 100644 --- a/karbon/plugins/imagetool/Makefile.am +++ b/karbon/plugins/imagetool/Makefile.am @@ -8,7 +8,7 @@ karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc karbon_imagetoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am index a8b9ce0de..3e5b767f8 100644 --- a/karbon/plugins/insertknots/Makefile.am +++ b/karbon/plugins/insertknots/Makefile.am @@ -6,7 +6,7 @@ karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc karbon_insertknotsplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = insertknotsplugin.rc diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am index 1b56da82c..e454b2cd9 100644 --- a/karbon/plugins/roundcorners/Makefile.am +++ b/karbon/plugins/roundcorners/Makefile.am @@ -6,7 +6,7 @@ karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc karbon_roundcornersplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = roundcornersplugin.rc diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am index a8e622a05..9837f11e8 100644 --- a/karbon/plugins/shadoweffect/Makefile.am +++ b/karbon/plugins/shadoweffect/Makefile.am @@ -6,7 +6,7 @@ karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc karbon_shadoweffectplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = shadoweffectplugin.rc diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am index 3272ffd52..3dd38a1ba 100644 --- a/karbon/plugins/whirlpinch/Makefile.am +++ b/karbon/plugins/whirlpinch/Makefile.am @@ -7,7 +7,7 @@ karbon_whirlpinchplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOPAINTER) $(LIB_KOFFI ../../libkarboncommon.la -karbon_whirlpinchplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_whirlpinchplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = whirlpinchplugin.rc diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am index a3cb2f096..1121d54f2 100644 --- a/karbon/plugins/zoomtool/Makefile.am +++ b/karbon/plugins/zoomtool/Makefile.am @@ -8,7 +8,7 @@ karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc karbon_zoomtoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_KOPAINTER) ../../libkarboncommon.la -karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) +karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am index 06d4e3059..8aa4070f9 100644 --- a/karbon/tools/Makefile.am +++ b/karbon/tools/Makefile.am @@ -57,7 +57,7 @@ karbon_defaulttools_la_SOURCES = \ vdefaulttools.cc karbon_defaulttools_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la -karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio +karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -lkjs -ltdefx -ltdeio karbon_defaulttools_la_METASOURCES = \ AUTO |