diff --git a/kcron/Makefile.am b/kcron/Makefile.am index e495b90..59a8bb8 100644 --- a/kcron/Makefile.am +++ b/kcron/Makefile.am @@ -97,7 +97,7 @@ INCLUDES= $(all_includes) kcron_METASOURCES = AUTO -kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kcron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcron.pot diff --git a/kdat/Makefile.am b/kdat/Makefile.am index 7007e06..f754006 100644 --- a/kdat/Makefile.am +++ b/kdat/Makefile.am @@ -63,7 +63,7 @@ kdat_SOURCES = \ # the library search path -kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am index 2fe7ee1..d30c8c2 100644 --- a/knetworkconf/knetworkconf/Makefile.am +++ b/knetworkconf/knetworkconf/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la -kcm_knetworkconfmodule_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -lDCOP +kcm_knetworkconfmodule_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) -lDCOP # the library search path. kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kpackage/Makefile.am b/kpackage/Makefile.am index 4d07f68..346d273 100644 --- a/kpackage/Makefile.am +++ b/kpackage/Makefile.am @@ -20,7 +20,7 @@ kpackage_SOURCES = kpackage.cpp managementWidget.cpp packageDisplay.cpp \ kpackage_METASOURCES = AUTO # the library search path -kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpackage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/ksysv/Makefile.am b/ksysv/Makefile.am index 2983d25..50a6bea 100644 --- a/ksysv/Makefile.am +++ b/ksysv/Makefile.am @@ -38,7 +38,7 @@ ksysv_SOURCES = main.cpp \ # the library search path ksysv_METASOURCES = AUTO -ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +ksysv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ksysv_LDADD = $(LIB_TDEFILE) -ltdeprint # this option you can leave out. Just, if you use "make dist", you need it diff --git a/kuser/Makefile.am b/kuser/Makefile.am index 740deec..178566f 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I.. -I$(top_srcdir)/kuser $(all_includes) # May be -D_XU_QUOTA -D_XU_SHADOW #AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kuser_LDADD = $(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_TDEABC) -ltdentlm ####### Files diff --git a/lilo-config/kde-qt-common/Makefile.am b/lilo-config/kde-qt-common/Makefile.am index f5b57eb..295759b 100644 --- a/lilo-config/kde-qt-common/Makefile.am +++ b/lilo-config/kde-qt-common/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES=libwidgets.la libwidgets_la_SOURCES = \ mainwidget.cpp general.cpp images.cpp expert.cpp \ EditWidget.cpp -libwidgets_la_LIBADD = $(LIB_QT) ../common/libcommon.la +libwidgets_la_LIBADD = $(LIB_TQT) ../common/libcommon.la libwidgets_la_METASOURCES = AUTO noinst_HEADERS = \ diff --git a/lilo-config/qt/Makefile.am b/lilo-config/qt/Makefile.am index fa0fd6c..ebd41ea 100644 --- a/lilo-config/qt/Makefile.am +++ b/lilo-config/qt/Makefile.am @@ -14,7 +14,7 @@ bin_PROGRAMS = lilo-config lilo_config_SOURCES = standalone.cpp Details.cpp InputBox.cpp lilo_config_LDFLAGS = $(all_libraries) -lilo_config_LDADD = $(LIB_QT) libwidgets.a +lilo_config_LDADD = $(LIB_TQT) libwidgets.a lilo_config_METASOURCES = AUTO AM_CXXFLAGS = -UUSE_KDE diff --git a/secpolicy/Makefile.am b/secpolicy/Makefile.am index c777048..22e98fd 100644 --- a/secpolicy/Makefile.am +++ b/secpolicy/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = secpolicy secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp secpolicy_LDADD = $(LIB_TDEIO) -secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = secpolicywin.h pamview.h ppitem.h diff --git a/tdefile-plugins/deb/Makefile.am b/tdefile-plugins/deb/Makefile.am index 7104bc7..500c51d 100644 --- a/tdefile-plugins/deb/Makefile.am +++ b/tdefile-plugins/deb/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_deb.la tdefile_deb_la_SOURCES = tdefile_deb.cpp tdefile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_deb_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) +tdefile_deb_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/rpm/Makefile.am b/tdefile-plugins/rpm/Makefile.am index 7315ab4..34bbcce 100644 --- a/tdefile-plugins/rpm/Makefile.am +++ b/tdefile-plugins/rpm/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_rpm.la tdefile_rpm_la_SOURCES = tdefile_rpm.cpp tdefile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_rpm_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) +tdefile_rpm_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO