diff options
| author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:07 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:07 +0900 |
| commit | 060b145232190d1a1532014537cc708f9226eca1 (patch) | |
| tree | 604ae997fc8c5a26802e1722d58f8c4a06b2e9cf | |
| parent | b5046419c8749a1a99ebe8dcf01f41639cdf5d9e (diff) | |
| download | filelight-060b145232190d1a1532014537cc708f9226eca1.tar.gz filelight-060b145232190d1a1532014537cc708f9226eca1.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <[email protected]>
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | src/app/Makefile.am | 2 | ||||
| -rw-r--r-- | src/part/Makefile.am | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 633b4fb..9674fe0 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)") @@ -5440,8 +5440,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" @@ -5488,7 +5488,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/app/Makefile.am b/src/app/Makefile.am index 53b0149..1e72ea4 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -5,4 +5,4 @@ METASOURCES = AUTO bin_PROGRAMS = filelight filelight_SOURCES = historyAction.cpp mainWindow.cpp main.cpp filelight_LDADD = $(LIB_TDEPARTS) $(LIB_TDEUI) -filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/src/part/Makefile.am b/src/part/Makefile.am index aa3c0ad..eaaae45 100644 --- a/src/part/Makefile.am +++ b/src/part/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO #Part kde_module_LTLIBRARIES = libfilelight.la -libfilelight_la_LIBADD = ./radialMap/libradialmap.la $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_QT) +libfilelight_la_LIBADD = ./radialMap/libradialmap.la $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUI) $(LIB_TQT) libfilelight_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx libfilelight_la_SOURCES = \ dialog.ui \ |