From 1316e3e9b4303d41050812134b857e373f9d1a4d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:33:14 -0600 Subject: [PATCH] Rename a few build variables for overall consistency --- ark/Makefile.am | 2 +- kcharselect/Makefile.am | 2 +- kdelirc/kcmlirc/Makefile.am | 2 +- kdf/Makefile.am | 6 +++--- kedit/Makefile.am | 2 +- kjots/Makefile.am | 2 +- klaptopdaemon/Makefile.am | 4 ++-- ktimer/Makefile.am | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ark/Makefile.am b/ark/Makefile.am index e6afc9d..bf14490 100644 --- a/ark/Makefile.am +++ b/ark/Makefile.am @@ -17,7 +17,7 @@ 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_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) +libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_TDEFILE) kde_module_LTLIBRARIES = libarkpart.la libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index 665537d..0046588 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -LDADD = $(LIB_KFILE) +LDADD = $(LIB_TDEFILE) bin_PROGRAMS = kcharselect kcharselect_SOURCES = kcharselectdia.cc main.cc diff --git a/kdelirc/kcmlirc/Makefile.am b/kdelirc/kcmlirc/Makefile.am index f58be13..3707367 100644 --- a/kdelirc/kcmlirc/Makefile.am +++ b/kdelirc/kcmlirc/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kcmlirc.la noinst_HEADERS = kcmlirc.h addaction.h addactionbase.h kcm_kcmlirc_la_SOURCES = selectprofile.ui newmode.ui kcmlircbase.ui kcmlirc.cpp addactionbase.ui addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp -kcm_kcmlirc_la_LIBADD = $(LIB_TDEUI) $(LIB_KFILE) ../kdelirc/libkdelirc.la +kcm_kcmlirc_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEFILE) ../kdelirc/libkdelirc.la kcm_kcmlirc_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined xdg_apps_DATA = kcmlirc.desktop diff --git a/kdf/Makefile.am b/kdf/Makefile.am index 2ddf348..530aca1 100644 --- a/kdf/Makefile.am +++ b/kdf/Makefile.am @@ -10,17 +10,17 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp kdf_SOURCES = kdf.cpp kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kdf_LDADD = libkdf_common.la $(LIB_KFILE) +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_KIO) -ltdetexteditor -kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE) +kwikdisk_LDADD = libkdf_common.la $(LIB_TDEFILE) kde_module_LTLIBRARIES = kcm_kdf.la kcm_kdf_la_SOURCES = kcmdf.cpp kcm_kdf_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_KFILE) +kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_TDEFILE) noinst_HEADERS = kdfwidget.h kcmdf.h kdfconfig.h mntconfig.h \ disks.h kdf.h disklist.h kwikdisk.h listview.h optiondialog.h stdoption.h diff --git a/kedit/Makefile.am b/kedit/Makefile.am index 4566b68..0ee11b7 100644 --- a/kedit/Makefile.am +++ b/kedit/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = tdeinit_LTLIBRARIES = kedit.la kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc -kedit_la_LIBADD = -ltdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +kedit_la_LIBADD = -ltdeprint $(LIB_TDEFILE) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = kedit.h ktextfiledlg.h\ diff --git a/kjots/Makefile.am b/kjots/Makefile.am index cc0862b..3289394 100644 --- a/kjots/Makefile.am +++ b/kjots/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) +LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) bin_PROGRAMS = kjots diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index bfcab8c..329ad82 100644 --- a/klaptopdaemon/Makefile.am +++ b/klaptopdaemon/Makefile.am @@ -17,12 +17,12 @@ klaptop_acpi_helper_LDADD = $(LIB_QT) klaptop_check_SOURCES = laptop_check.cpp klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -klaptop_check_LDADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la +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_KIO) -ltdetexteditor -module -kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la +kcm_laptop_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la kcm_laptop_la_COMPILE_FIRST = crcresult.h AM_CPPFLAGS = $(all_includes) diff --git a/ktimer/Makefile.am b/ktimer/Makefile.am index 9778bc7..d7fdb89 100644 --- a/ktimer/Makefile.am +++ b/ktimer/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -LDADD = $(LIB_TDEUI) $(LIB_KFILE) +LDADD = $(LIB_TDEUI) $(LIB_TDEFILE) bin_PROGRAMS = ktimer