diff options
| author | Michele Calgaro <[email protected]> | 2018-09-17 23:20:11 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-17 23:20:11 +0900 |
| commit | 1e05f594d3350057eb7dc02a0c3be41d6ee26c45 (patch) | |
| tree | 7d017fa36f55f4ff4651936104645b020f4ed538 | |
| parent | e868e3473662fcb34283da6f752810b6a5d737e3 (diff) | |
| download | kbarcode-1e05f594d3350057eb7dc02a0c3be41d6ee26c45.tar.gz kbarcode-1e05f594d3350057eb7dc02a0c3be41d6ee26c45.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-- | fileplugin/Makefile.am | 4 | ||||
| -rw-r--r-- | kbarcode/Makefile.am | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 29f9a8b..361ba0d 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)") @@ -5442,8 +5442,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" @@ -5490,7 +5490,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/fileplugin/Makefile.am b/fileplugin/Makefile.am index 0905c5b..c98fff9 100644 --- a/fileplugin/Makefile.am +++ b/fileplugin/Makefile.am @@ -4,8 +4,8 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = tdefile_kbarcode.la tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp -tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries) -tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE) $(LIB_QT) +tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TQT) $(all_libraries) +tdefile_kbarcode_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDECORE) $(LIB_TQT) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am index 999f370..ee19171 100644 --- a/kbarcode/Makefile.am +++ b/kbarcode/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = kbarcode # the application source, library search path, and link libraries -kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kbarcode_LDADD = $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEPRINT) \ $(LIB_TDEUI) -lkjs -lpcre |