diff options
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | kdiff3plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ce0f0d5..97d87b2 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_TDEFILE, "-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/kdiff3plugin/Makefile.am b/kdiff3plugin/Makefile.am index 7e71ad6..fb4733b 100644 --- a/kdiff3plugin/Makefile.am +++ b/kdiff3plugin/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libkdiff3plugin.la libkdiff3plugin_la_SOURCES = kdiff3plugin.cpp libkdiff3plugin_la_LIBADD = -lkonq $(LIB_TDECORE) $(LIB_TDEUI) -libkdiff3plugin_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) +libkdiff3plugin_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) #KDE_ICON = KDiff3 diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 829f22b..15522a2 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -160,7 +160,7 @@ LIB_TDEUNITTEST = -ltdeunittest LIB_TDEUTILS = -ltdeutils LIB_POLL = LIB_QPE = -LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread +LIB_TQT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread LIB_SMB = -lsmb LIB_X11 = -lX11 $(LIBSOCKET) LIB_XEXT = -lXext diff --git a/src/Makefile.am b/src/Makefile.am index d949623..1212c3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kdiff3 # the application source, library search path, and link libraries kdiff3_SOURCES = main.cpp kdiff3_shell.cpp -kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kdiff3_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go @@ -46,7 +46,7 @@ libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \ merger.cpp pdiff.cpp difftextwindow.cpp diff.cpp optiondialog.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_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) libkdiff3part_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE) # this is where the desktop file will go |