diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:23 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:23 +0900 |
| commit | 8b1b3a64d6e742dabd2eb9a72ed56315dd55d740 (patch) | |
| tree | b095cb88c73fccd224befc5ec6575dd13b65d9b2 | |
| parent | 203c3d77ef5fb7eec34f47dec27dcd37b80d2195 (diff) | |
| download | knemo-8b1b3a64.tar.gz knemo-8b1b3a64.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-- | src/kcm/Makefile.am | 2 | ||||
| -rw-r--r-- | src/knemod/Makefile.am | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b778768..649f79d 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/src/kcm/Makefile.am b/src/kcm/Makefile.am index cbe549f..1dc0ed8 100644 --- a/src/kcm/Makefile.am +++ b/src/kcm/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../common -I$(srcdir)/../knemod/backends $(all_includes) kcm_knemo_la_LDFLAGS = -module -avoid-version $(all_libraries) # the libraries to link against. -kcm_knemo_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP +kcm_knemo_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP # which sources should be compiled for knemo kcm_knemo_la_SOURCES = configdialog.cpp configdlg.ui diff --git a/src/knemod/Makefile.am b/src/knemod/Makefile.am index 5a80d88..e3a11dd 100644 --- a/src/knemod/Makefile.am +++ b/src/knemod/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = -I$(srcdir)/../common -I$(srcdir)/backends $(all_includes) kded_knemod_la_LDFLAGS = -module -avoid-version $(all_libraries) # the libraries to link against. -kded_knemod_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP -ltdeinit_kded backends/libknemo_backends.la +kded_knemod_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP -ltdeinit_kded backends/libknemo_backends.la # which sources should be compiled for knemo kded_knemod_la_SOURCES = knemodaemon.cpp knemodaemon.skel interface.cpp \ |