diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:15 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:15 +0900 |
| commit | 0ead791b7e2487c1a82b716c752ea5f8298a0d3c (patch) | |
| tree | f9a1ec2b5a5c1d8a30577b014481138920327513 | |
| parent | a1615e273a8940e9eb82429a3ed6f5a121b172c4 (diff) | |
| download | kdbg-0ead791b7e2487c1a82b716c752ea5f8298a0d3c.tar.gz kdbg-0ead791b7e2487c1a82b716c752ea5f8298a0d3c.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | kdbg/Makefile.am | 2 | ||||
| -rw-r--r-- | kdbg/testprogs/Makefile.am | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dee69f0..8f5d05d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1601,19 +1601,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) @@ -2125,7 +2125,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)") @@ -5469,8 +5469,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" @@ -5517,7 +5517,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/kdbg/Makefile.am b/kdbg/Makefile.am index 19ba3c7..178464c 100644 --- a/kdbg/Makefile.am +++ b/kdbg/Makefile.am @@ -40,7 +40,7 @@ kdbg_LDFLAGS = \ $(all_libraries) $(KDE_RPATH) # the libraries to link against. -kdbg_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +kdbg_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = \ diff --git a/kdbg/testprogs/Makefile.am b/kdbg/testprogs/Makefile.am index a59a6ce..edfb980 100644 --- a/kdbg/testprogs/Makefile.am +++ b/kdbg/testprogs/Makefile.am @@ -30,7 +30,7 @@ noinst_PROGRAMS = $(PROGS) testfile_SOURCES = testfile.cpp testfile_LDFLAGS = -g $(all_libraries) $(KDE_RPATH) -testfile_LDADD = $(LIB_QT) +testfile_LDADD = $(LIB_TQT) locals_SOURCES = locals.cpp locals_LDFLAGS = -g @@ -40,11 +40,11 @@ maths_LDFLAGS = -g qt_SOURCES = qt.cpp qt_LDFLAGS = -g $(all_libraries) $(KDE_RPATH) -qt_LDADD = $(LIB_QT) +qt_LDADD = $(LIB_TQT) repeats_SOURCES = repeats.cpp repeats_LDFLAGS = -g $(all_libraries) $(KDE_RPATH) -repeats_LDADD = $(LIB_QT) +repeats_LDADD = $(LIB_TQT) std_SOURCES = std.cpp std_LDFLAGS = -g |