[tdeutils][master] 2a2d1c25

ark/Makefile.am

diff --git a/ark/Makefile.am b/ark/Makefile.am

index 60f5fe8..ee4ca6d 100644

--- a/ark/Makefile.am

+++ b/ark/Makefile.am

@@ -10,18 +10,18 @@

 ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp

 ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN)

-ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)  libark_common.la $(LIB_TDEPARTS)

+ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)  libark_common.la $(LIB_TDEPARTS)

 ark_la_COMPILE_FIRST = settings.h

 noinst_LTLIBRARIES = libark_common.la

 libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp

 libark_common_la_LDFLAGS = $(all_libraries) -no-undefined

-libark_common_la_LIBADD  = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)  $(LIB_TDEFILE)

+libark_common_la_LIBADD  = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)  $(LIB_TDEFILE)

 kde_module_LTLIBRARIES = libarkpart.la

 libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)

-libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)  libark_common.la $(LIB_TDEPARTS)

+libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)  libark_common.la $(LIB_TDEPARTS)

 libarkpart_la_COMPILE_FIRST = settings.h

 libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \

kcalc/Makefile.am

diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am

index 73d3d7c..dff9fd8 100644

--- a/kcalc/Makefile.am

+++ b/kcalc/Makefile.am

@@ -19,7 +19,7 @@

 			kcalctype.h dlabel.h stats.h

 kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version

-kcalc_la_LIBADD = $(LIB_TDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_TDECORE)

+kcalc_la_LIBADD = $(LIB_TDEUI) knumber/libknumber.la $(LIB_TQT) $(LIB_TDECORE)

 KDE_ICON = kcalc

kcalc/knumber/tests/Makefile.am

diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am

index 0ae6f8e..5c7edf4 100644

--- a/kcalc/knumber/tests/Makefile.am

+++ b/kcalc/knumber/tests/Makefile.am

@@ -28,5 +28,5 @@

 METASOURCES = AUTO

 knumbertest_SOURCES = knumbertest.cpp

-knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)

-knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+knumbertest_LDADD = ../libknumber.la $(LIB_TQT) $(LIBGMP)

+knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

kcharselect/Makefile.am

diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am

index f6dcede..2cce07f 100644

--- a/kcharselect/Makefile.am

+++ b/kcharselect/Makefile.am

@@ -3,7 +3,7 @@

 bin_PROGRAMS = kcharselect

 kcharselect_SOURCES = kcharselectdia.cc main.cc

-kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kcharselect_METASOURCES = kcharselectdia.moc

 updatedir = $(kde_datadir)/tdeconf_update

kdf/Makefile.am

diff --git a/kdf/Makefile.am b/kdf/Makefile.am

index 0fd869c..31ea3ec 100644

--- a/kdf/Makefile.am

+++ b/kdf/Makefile.am

@@ -9,11 +9,11 @@

 	disks.cpp listview.cpp optiondialog.cpp stdoption.cpp

 kdf_SOURCES = kdf.cpp

-kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kdf_LDADD = libkdf_common.la $(LIB_TDEFILE)

 kwikdisk_SOURCES = kwikdisk.cpp

-kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kwikdisk_LDADD = libkdf_common.la $(LIB_TDEFILE)

 kde_module_LTLIBRARIES = kcm_kdf.la

kedit/Makefile.am

diff --git a/kedit/Makefile.am b/kedit/Makefile.am

index 0ee11b7..463e896 100644

--- a/kedit/Makefile.am

+++ b/kedit/Makefile.am

@@ -12,7 +12,7 @@

 tdeinit_LTLIBRARIES = kedit.la

 kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc

-kedit_la_LIBADD = -ltdeprint $(LIB_TDEFILE) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)

+kedit_la_LIBADD = -ltdeprint $(LIB_TDEFILE) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)

 kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)

 noinst_HEADERS = kedit.h ktextfiledlg.h\

kfloppy/Makefile.am

diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am

index 27b0bc2..f837f53 100644

--- a/kfloppy/Makefile.am

+++ b/kfloppy/Makefile.am

@@ -1,4 +1,4 @@

-kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kfloppy_LDADD =  $(LIB_TDEUI) -lm

 INCLUDES =	$(all_includes)

kgpg/Makefile.am

diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am

index 780c012..e4b78eb 100644

--- a/kgpg/Makefile.am

+++ b/kgpg/Makefile.am

@@ -28,7 +28,7 @@

 METASOURCES = AUTO

 # the library search path.

-kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 appsdir = $(kde_datadir)/kgpg

 apps_DATA = kgpg.rc listkeys.rc tips

khexedit/Makefile.am

diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am

index 557e6c7..45c34f7 100644

--- a/khexedit/Makefile.am

+++ b/khexedit/Makefile.am

@@ -20,7 +20,7 @@

 exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h

 khexedit_METASOURCES = AUTO

-khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 khexedit_LDADD = $(LIB_TDEIO) $(LIB_TDEPRINT)

 xdg_apps_DATA = khexedit.desktop

khexedit/l

diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am

index 6b124d3..44ae83c 100644

--- a/khexedit/lib/Makefile.am

+++ b/khexedit/lib/Makefile.am

@@ -7,7 +7,7 @@

 # this library is used by the kbytesedit part and the khepart part

 lib_LTLIBRARIES =  libkhexeditcommon.la

 libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined

-libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_TDECORE) $(LIB_QT)

+libkhexeditcommon_la_LIBADD =  controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_TDECORE) $(LIB_TQT)

 libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \

                                kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \

                                kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \

kjots/Makefile.am

diff --git a/kjots/Makefile.am b/kjots/Makefile.am

index 82b6626..b341880 100644

--- a/kjots/Makefile.am

+++ b/kjots/Makefile.am

@@ -1,5 +1,5 @@

 INCLUDES = $(all_includes)

-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 LDADD =  $(LIB_TDEFILE) $(LIB_TDEPRINT)

 bin_PROGRAMS = kjots

klaptopdaemon/Makefile.am

diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am

index da40ae6..a6ba560 100644

--- a/klaptopdaemon/Makefile.am

+++ b/klaptopdaemon/Makefile.am

@@ -4,30 +4,30 @@

 SUBDIRS = pics applnk

 libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp

-libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 libkcmlaptop_la_LIBADD  = $(LIB_TDEUI)

 MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c

 kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel

-kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kded_klaptopdaemon_la_LIBADD   = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la

 klaptop_acpi_helper_SOURCES = acpi_helper.cpp

-klaptop_acpi_helper_LDADD = $(LIB_QT)

+klaptop_acpi_helper_LDADD = $(LIB_TQT)

 klaptop_check_SOURCES = laptop_check.cpp

-klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+klaptop_check_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 klaptop_check_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la

 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \

 	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp

-kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module

+kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module

 kcm_laptop_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la

 kcm_laptop_la_COMPILE_FIRST = crcresult.h

 AM_CPPFLAGS = $(all_includes)

-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 KDE_OPTIONS = nofinal

@@ -42,7 +42,7 @@

 noinst_PROGRAMS = makecrc

 makecrc_SOURCES = makecrc.cpp

-makecrc_LDADD = $(LIBZ) $(LIB_QT)

+makecrc_LDADD = $(LIBZ) $(LIB_TQT)

 crcresult.h:	makecrc klaptop_acpi_helper

 	./makecrc >crcresult.h

kmilo/kmilod/Makefile.am

diff --git a/kmilo/kmilod/Makefile.am b/kmilo/kmilod/Makefile.am

index cf312e2..4897ef0 100644

--- a/kmilo/kmilod/Makefile.am

+++ b/kmilo/kmilod/Makefile.am

@@ -27,7 +27,7 @@

 lib_LTLIBRARIES = libkmilo.la

 libkmilo_la_SOURCES = monitor.cpp displayskin.cpp

 libkmilo_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)

-libkmilo_la_LIBADD = $(LIB_QT)

+libkmilo_la_LIBADD = $(LIB_TQT)

 METASOURCES = AUTO

kregexpeditor/Makefile.am

diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am

index d21c7a8..b4b6625 100644

--- a/kregexpeditor/Makefile.am

+++ b/kregexpeditor/Makefile.am

@@ -29,7 +29,7 @@

 libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined

 libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \

-	KWidgetStreamer/libkwidgetstreamer.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)

+	KWidgetStreamer/libkwidgetstreamer.la $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)

 METASOURCES = AUTO

@@ -46,7 +46,7 @@

 bin_PROGRAMS = kregexpeditor

 kregexpeditor_SOURCES = main.cpp

-kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

+kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

 kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_TDEIO)

 kregexpeditor_INCLUDES =  $(all_includes)

ksim/library/Makefile.am

diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am

index f68b0a5..1b1947f 100644

--- a/ksim/library/Makefile.am

+++ b/ksim/library/Makefile.am

@@ -7,7 +7,7 @@

                                         pluginmodule.cpp ksimconfig.cpp

 libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined

-libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -ltdefx

+libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) -ltdefx

** Diff limit reached (max: 250 lines) **

2a2d1c25	2018-09-17 09:19:55	Michele Calgaro
LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro <michele.calgaro@...>
M ark/Makefile.am M kcalc/Makefile.am M kcalc/knumber/tests/Makefile.am M kcharselect/Makefile.am M kdf/Makefile.am M kedit/Makefile.am M kfloppy/Makefile.am M kgpg/Makefile.am M khexedit/Makefile.am M khexedit/lib/Makefile.am M kjots/Makefile.am M klaptopdaemon/Makefile.am M kmilo/kmilod/Makefile.am M kregexpeditor/Makefile.am M ksim/library/Makefile.am M ktimer/Makefile.am M superkaramba/src/Makefile.am M tdefilereplace/Makefile.am M tdelirc/tdelirc/Makefile.am M tdessh/Makefile.am M tdewallet/Makefile.am
ark/Makefile.am diff --git a/ark/Makefile.am b/ark/Makefile.am index 60f5fe8..ee4ca6d 100644 --- a/ark/Makefile.am +++ b/ark/Makefile.am @@ -10,18 +10,18 @@ ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN) -ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) +ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) libark_common.la $(LIB_TDEPARTS) ark_la_COMPILE_FIRST = settings.h noinst_LTLIBRARIES = libark_common.la libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp libark_common_la_LDFLAGS = $(all_libraries) -no-undefined -libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) +libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEFILE) kde_module_LTLIBRARIES = libarkpart.la libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) +libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) libark_common.la $(LIB_TDEPARTS) libarkpart_la_COMPILE_FIRST = settings.h libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \ kcalc/Makefile.am diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am index 73d3d7c..dff9fd8 100644 --- a/kcalc/Makefile.am +++ b/kcalc/Makefile.am @@ -19,7 +19,7 @@ kcalctype.h dlabel.h stats.h kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version -kcalc_la_LIBADD = $(LIB_TDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_TDECORE) +kcalc_la_LIBADD = $(LIB_TDEUI) knumber/libknumber.la $(LIB_TQT) $(LIB_TDECORE) KDE_ICON = kcalc kcalc/knumber/tests/Makefile.am diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am index 0ae6f8e..5c7edf4 100644 --- a/kcalc/knumber/tests/Makefile.am +++ b/kcalc/knumber/tests/Makefile.am @@ -28,5 +28,5 @@ METASOURCES = AUTO knumbertest_SOURCES = knumbertest.cpp -knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP) -knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +knumbertest_LDADD = ../libknumber.la $(LIB_TQT) $(LIBGMP) +knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcharselect/Makefile.am diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index f6dcede..2cce07f 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = kcharselect kcharselect_SOURCES = kcharselectdia.cc main.cc -kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcharselect_METASOURCES = kcharselectdia.moc updatedir = $(kde_datadir)/tdeconf_update kdf/Makefile.am diff --git a/kdf/Makefile.am b/kdf/Makefile.am index 0fd869c..31ea3ec 100644 --- a/kdf/Makefile.am +++ b/kdf/Makefile.am @@ -9,11 +9,11 @@ disks.cpp listview.cpp optiondialog.cpp stdoption.cpp kdf_SOURCES = kdf.cpp -kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kdf_LDADD = libkdf_common.la $(LIB_TDEFILE) kwikdisk_SOURCES = kwikdisk.cpp -kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kwikdisk_LDADD = libkdf_common.la $(LIB_TDEFILE) kde_module_LTLIBRARIES = kcm_kdf.la kedit/Makefile.am diff --git a/kedit/Makefile.am b/kedit/Makefile.am index 0ee11b7..463e896 100644 --- a/kedit/Makefile.am +++ b/kedit/Makefile.am @@ -12,7 +12,7 @@ tdeinit_LTLIBRARIES = kedit.la kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc -kedit_la_LIBADD = -ltdeprint $(LIB_TDEFILE) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +kedit_la_LIBADD = -ltdeprint $(LIB_TDEFILE) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = kedit.h ktextfiledlg.h\ kfloppy/Makefile.am diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am index 27b0bc2..f837f53 100644 --- a/kfloppy/Makefile.am +++ b/kfloppy/Makefile.am @@ -1,4 +1,4 @@ -kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kfloppy_LDADD = $(LIB_TDEUI) -lm INCLUDES = $(all_includes) kgpg/Makefile.am diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index 780c012..e4b78eb 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -28,7 +28,7 @@ METASOURCES = AUTO # the library search path. -kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor appsdir = $(kde_datadir)/kgpg apps_DATA = kgpg.rc listkeys.rc tips khexedit/Makefile.am diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am index 557e6c7..45c34f7 100644 --- a/khexedit/Makefile.am +++ b/khexedit/Makefile.am @@ -20,7 +20,7 @@ exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h khexedit_METASOURCES = AUTO -khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor khexedit_LDADD = $(LIB_TDEIO) $(LIB_TDEPRINT) xdg_apps_DATA = khexedit.desktop khexedit/l diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am index 6b124d3..44ae83c 100644 --- a/khexedit/lib/Makefile.am +++ b/khexedit/lib/Makefile.am @@ -7,7 +7,7 @@ # this library is used by the kbytesedit part and the khepart part lib_LTLIBRARIES = libkhexeditcommon.la libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined -libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_TDECORE) $(LIB_QT) +libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_TDECORE) $(LIB_TQT) libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \ kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \ kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \ kjots/Makefile.am diff --git a/kjots/Makefile.am b/kjots/Makefile.am index 82b6626..b341880 100644 --- a/kjots/Makefile.am +++ b/kjots/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) bin_PROGRAMS = kjots klaptopdaemon/Makefile.am diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index da40ae6..a6ba560 100644 --- a/klaptopdaemon/Makefile.am +++ b/klaptopdaemon/Makefile.am @@ -4,30 +4,30 @@ SUBDIRS = pics applnk libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp -libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkcmlaptop_la_LIBADD = $(LIB_TDEUI) MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel -kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kded_klaptopdaemon_la_LIBADD = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la klaptop_acpi_helper_SOURCES = acpi_helper.cpp -klaptop_acpi_helper_LDADD = $(LIB_QT) +klaptop_acpi_helper_LDADD = $(LIB_TQT) klaptop_check_SOURCES = laptop_check.cpp -klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +klaptop_check_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor klaptop_check_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \ acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp -kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module +kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module kcm_laptop_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la kcm_laptop_la_COMPILE_FIRST = crcresult.h AM_CPPFLAGS = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor KDE_OPTIONS = nofinal @@ -42,7 +42,7 @@ noinst_PROGRAMS = makecrc makecrc_SOURCES = makecrc.cpp -makecrc_LDADD = $(LIBZ) $(LIB_QT) +makecrc_LDADD = $(LIBZ) $(LIB_TQT) crcresult.h: makecrc klaptop_acpi_helper ./makecrc >crcresult.h kmilo/kmilod/Makefile.am diff --git a/kmilo/kmilod/Makefile.am b/kmilo/kmilod/Makefile.am index cf312e2..4897ef0 100644 --- a/kmilo/kmilod/Makefile.am +++ b/kmilo/kmilod/Makefile.am @@ -27,7 +27,7 @@ lib_LTLIBRARIES = libkmilo.la libkmilo_la_SOURCES = monitor.cpp displayskin.cpp libkmilo_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries) -libkmilo_la_LIBADD = $(LIB_QT) +libkmilo_la_LIBADD = $(LIB_TQT) METASOURCES = AUTO kregexpeditor/Makefile.am diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am index d21c7a8..b4b6625 100644 --- a/kregexpeditor/Makefile.am +++ b/kregexpeditor/Makefile.am @@ -29,7 +29,7 @@ libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \ - KWidgetStreamer/libkwidgetstreamer.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) + KWidgetStreamer/libkwidgetstreamer.la $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) METASOURCES = AUTO @@ -46,7 +46,7 @@ bin_PROGRAMS = kregexpeditor kregexpeditor_SOURCES = main.cpp -kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_TDEIO) kregexpeditor_INCLUDES = $(all_includes) ksim/library/Makefile.am diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am index f68b0a5..1b1947f 100644 --- a/ksim/library/Makefile.am +++ b/ksim/library/Makefile.am @@ -7,7 +7,7 @@ pluginmodule.cpp ksimconfig.cpp libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined -libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -ltdefx +libksimcore_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) -ltdefx Diff limit reached (max: 250 lines)

Branch: master

ark/Makefile.am

kcalc/Makefile.am

kcalc/knumber/tests/Makefile.am

kcharselect/Makefile.am

kdf/Makefile.am

kedit/Makefile.am

kfloppy/Makefile.am

kgpg/Makefile.am

khexedit/Makefile.am

khexedit/l

kjots/Makefile.am

klaptopdaemon/Makefile.am

kmilo/kmilod/Makefile.am

kregexpeditor/Makefile.am

ksim/library/Makefile.am