diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:58:22 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:17:00 +0200 |
| commit | 9d017418fed33fa6de92fb3c96f0af294dcb4169 (patch) | |
| tree | 48752953862b73f23f140e5a991395cfe852773e | |
| parent | 7bf29752d631a246dd0767149aa42cb478369646 (diff) | |
| download | potracegui-9d017418fed33fa6de92fb3c96f0af294dcb4169.tar.gz potracegui-9d017418fed33fa6de92fb3c96f0af294dcb4169.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | po/Makefile.in | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 99195a6..b775cde 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2018,30 +2018,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-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_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/po/Makefile.in b/po/Makefile.in index 42d925e..bd81c3a 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -140,11 +140,11 @@ LIB_TDEUI = @LIB_TDEUI@ LIB_TDEFILE = @LIB_TDEFILE@ LIB_KFM = @LIB_KFM@ LIB_TDEHTML = @LIB_TDEHTML@ -LIB_KIO = @LIB_KIO@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ +LIB_TDEIO = @LIB_TDEIO@ +LIB_TDEPARTS = @LIB_TDEPARTS@ +LIB_TDESPELL = @LIB_TDESPELL@ +LIB_TDESYCOCA = @LIB_TDESYCOCA@ +LIB_TDEUTILS = @LIB_TDEUTILS@ LIB_POLL = @LIB_POLL@ LIB_QPE = @LIB_QPE@ LIB_QT = @LIB_QT@ diff --git a/src/Makefile.am b/src/Makefile.am index 1eb09ab..2317812 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = potracegui # the application source, library search path, and link libraries potracegui_SOURCES = main.cpp potracegui.cpp autotraceformats.cpp MainWidgetBase.ui mainwidget.cpp options.cpp -potracegui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -potracegui_LDADD = $(LIB_KIO) $(LIB_TDEUI) +potracegui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +potracegui_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities |