diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:20:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:20:34 -0600 |
| commit | e863593e4cef4013691fd96440d052015ef9c4c5 (patch) | |
| tree | fb58a0ccd493b8220d2ca32f33deb684100de8f9 | |
| parent | 6945e4f25035550592b183bcea988980898ee571 (diff) | |
| download | kdirstat-e863593e4cef4013691fd96440d052015ef9c4c5.tar.gz kdirstat-e863593e4cef4013691fd96440d052015ef9c4c5.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | kdirstat.kdevprj | 4 | ||||
| -rw-r--r-- | kdirstat/Makefile.am | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2ff5f6a..8c47299 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2030,14 +2030,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_TDEPIM, "-ltdepim") # 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") @@ -2047,7 +2047,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/kdirstat.kdevprj b/kdirstat.kdevprj index b07f078..ac73a79 100644 --- a/kdirstat.kdevprj +++ b/kdirstat.kdevprj @@ -16,7 +16,7 @@ type=DATA [Config for BinMakefileAm] bin_program=kdirstat cxxflags=-O0 -g3 -Wall -ldadd=$(LIB_KFILE) -ltdeui -ltdecore $(LIB_QT) +ldadd=$(LIB_TDEFILE) -ltdeui -ltdecore $(LIB_QT) ldflags= [General] AMChanged=false @@ -44,7 +44,7 @@ Headers=*.h,*.hh,*.hxx,*.hpp,*.H Others=* Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l Translations=*.po -B_KFILEUser Interface=*.kdevdlg,*.ui,*.rc +B_TDEFILEUser Interface=*.kdevdlg,*.ui,*.rc groups=Headers,Sources,User Interface,Translations,GNU,Others [Makefile.am] files=kdirstat.kdevprj,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,kdirstat.lsm diff --git a/kdirstat/Makefile.am b/kdirstat/Makefile.am index 219977a..d4312fc 100644 --- a/kdirstat/Makefile.am +++ b/kdirstat/Makefile.am @@ -58,7 +58,7 @@ update_DATA = kdirstat.upd update_SCRIPTS = fix_move_to_trash_bin.pl -kdirstat_LDADD = $(LIB_KFILE) +kdirstat_LDADD = $(LIB_TDEFILE) KDE_ICON = kdirstat |