diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:20:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:20:32 -0600 |
| commit | 78d2bce981429509beab897fb1f1bdca82388a29 (patch) | |
| tree | 7d3d4d7e21de8f292bdff2a6f4e4352a1b3dcf86 | |
| parent | d6d68f9aa5b522be7671c0641323660139fdf84a (diff) | |
| download | kdiff3-78d2bce981429509beab897fb1f1bdca82388a29.tar.gz kdiff3-78d2bce981429509beab897fb1f1bdca82388a29.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 209479d..31da664 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 674f4df..215f99a 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -146,7 +146,7 @@ LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui LIB_KDNSSD = -ltdednssd -LIB_KFILE = -ltdeio +LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml LIB_KIMPROXY = -ltdeimproxy diff --git a/src/Makefile.am b/src/Makefile.am index 04aeda8..a73b52e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,7 +47,7 @@ libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \ mergeresultwindow.cpp fileaccess.cpp gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp \ common.cpp smalldialogs.cpp libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KPARTS) $(LIB_KFILE) +libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KPARTS) $(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) |