diff options
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | kshowmail/Makefile.am | 2 | ||||
| -rw-r--r-- | kshowmail/kcmconfigs/Makefile.am | 14 |
3 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4893c49..c1ce922 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC KDE_CHECK_QT_JPEG if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -5443,8 +5443,8 @@ AC_DEFUN([AC_PATH_QTOPIA], AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -5491,7 +5491,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" diff --git a/kshowmail/Makefile.am b/kshowmail/Makefile.am index c1b99ac..80441f3 100644 --- a/kshowmail/Makefile.am +++ b/kshowmail/Makefile.am @@ -11,7 +11,7 @@ kshowmail_SOURCES = AlertDlg.ui alertdialog.cpp configelem.cpp configlist.cpp \ showmaildialog.cpp showrecord.cpp showrecordelem.cpp uniqueapp.cpp filterlogview.cpp \ filterlogviewdeleteditem.cpp filterlogviewmoveditem.cpp kshowmail_LDADD = $(LIB_TDEUTILS) -lmimelib $(LIB_KFILE) $(LIB_TDEUI) \ - $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) $(LIBSOCKET) -ltdewalletclient -lDCOP + $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT) $(LIBSOCKET) -ltdewalletclient -lDCOP EXTRA_DIST = main.cpp kshowmail.cpp kshowmail.h kshowmaildoc.cpp kshowmaildoc.h commandentry.cpp commandentry.h kshowmailview.cpp kshowmailview.h OptionDlg.ui OptionDlg.h optiondialog.cpp optiondialog.h ServerDlg.ui serverdialog.cpp serverdialog.h EditDlg.ui editdialog.cpp editdialog.h commanddialog.cpp commanddialog.h CommandDlg.ui commandlist.cpp commandlist.h CommandEntryDlg.ui commandentrydialog.cpp commandentrydialog.h configelem.cpp configelem.h kshowmaildock.cpp kshowmaildock.h configlist.cpp configlist.h AlertDlg.ui alertdialog.cpp alertdialog.h uniqueapp.cpp uniqueapp.h showrecordelem.cpp showrecordelem.h showrecord.cpp showrecord.h kshowmail.desktop decodeRFC2047.h decodeRFC2047.cpp showlistviewitem.cpp showlistviewitem.h kfeedback.cpp kfeedback.h kshowmailfeedback.cpp filter.cpp filter.h filterelem.cpp filterelem.h filterdialog.cpp filterdialog.h FilterDlg.ui FilterEntryDlg.ui filterentrydialog.cpp filterentrydialog.h filterlist.cpp filterlist.h logger.cpp logger.h diff --git a/kshowmail/kcmconfigs/Makefile.am b/kshowmail/kcmconfigs/Makefile.am index a45fdf4..1b11abb 100644 --- a/kshowmail/kcmconfigs/Makefile.am +++ b/kshowmail/kcmconfigs/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_kshowmailconfigaccounts.la \ kcm_kshowmailconfigactions.la kcm_kshowmailconfigdisplay.la kcm_kshowmailconfigfilter.la \ kcm_kshowmailconfiggeneral.la kcm_kshowmailconfiglog.la kcm_kshowmailconfigspamcheck.la -kcm_kshowmailconfigactions_la_LDFLAGS = -avoid-version -module $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) +kcm_kshowmailconfigactions_la_LDFLAGS = -avoid-version -module $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) noinst_HEADERS = accountsetupdialog.h accountsetupitem.h configaccounts.h \ configactions.h configdisplay.h configfilter.h configgeneral.h configlog.h \ configspamcheck.h encryption.h filtercriteriawidget.h filtersetupdialog.h \ @@ -14,23 +14,23 @@ kde_services_DATA = kshowmailconfigaccounts.desktop \ kshowmailconfigactions.desktop kshowmailconfigdisplay.desktop kshowmailconfigfilter.desktop \ kshowmailconfiggeneral.desktop kshowmailconfiglog.desktop kshowmailconfigspamcheck.desktop kcm_kshowmailconfiggeneral_la_LDFLAGS = -avoid-version -module\ - $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) + $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) kcm_kshowmailconfiggeneral_la_SOURCES = configgeneral.cpp kcm_kshowmailconfigdisplay_la_LDFLAGS = -avoid-version -module\ - $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) + $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) kcm_kshowmailconfigdisplay_la_SOURCES = configdisplay.cpp kcm_kshowmailconfigaccounts_la_LDFLAGS = -avoid-version -module\ - $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdewalletclient + $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdewalletclient kcm_kshowmailconfigaccounts_la_SOURCES = configaccounts.cpp \ accountsetupitem.cpp accountsetupdialog.cpp encryption.cpp tdewalletaccess.cpp kcm_kshowmailconfigfilter_la_LDFLAGS = -avoid-version -module\ - $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) + $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) kcm_kshowmailconfigfilter_la_SOURCES = configfilter.cpp senderlistdialog.cpp \ filtersetupitem.cpp filtersetupdialog.cpp filtercriteriawidget.cpp mailboxwizard.cpp \ mailboxwizardlistitem.cpp -kcm_kshowmailconfiglog_la_LDFLAGS = $(all_libraries) -avoid-version -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +kcm_kshowmailconfiglog_la_LDFLAGS = $(all_libraries) -avoid-version -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) kcm_kshowmailconfiglog_la_SOURCES = configlog.cpp kcm_kshowmailconfigspamcheck_la_LDFLAGS = $(all_libraries) -avoid-version \ - -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) + -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) kcm_kshowmailconfigspamcheck_la_SOURCES = configspamcheck.cpp mailboxwizard.cpp \ mailboxwizardlistitem.cpp |