Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 9 months ago
parent
commit
97389c75d0
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 11 additions and 11 deletions
  1. 9
    9
      acinclude.m4
  2. 2
    2
      krename/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC
1577 1577
 KDE_CHECK_QT_JPEG
1578 1578
 
1579 1579
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1580
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1580
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1581 1581
 else
1582
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1582
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1583 1583
 fi
1584
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1584
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1585 1585
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1586 1586
   if test -e "$a"; then
1587
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1587
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1588 1588
      break
1589 1589
   fi
1590 1590
 done
1591 1591
 
1592
-AC_SUBST(LIB_QT)
1592
+AC_SUBST(LIB_TQT)
1593 1593
 AC_SUBST(LIB_QPE)
1594 1594
 
1595 1595
 AC_SUBST(kde_qtver)
@@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
2101 2101
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102 2102
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2105 2105
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106 2106
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107 2107
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5442,8 +5442,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
5442 5442
 
5443 5443
   AC_MSG_CHECKING([for Qtopia])
5444 5444
 
5445
-  LIB_QTOPIA="-lqpe"
5446
-  AC_SUBST(LIB_QTOPIA)
5445
+  LIB_TQTOPIA="-lqpe"
5446
+  AC_SUBST(LIB_TQTOPIA)
5447 5447
 
5448 5448
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
5449 5449
 
@@ -5490,7 +5490,7 @@ is required.])
5490 5490
 
5491 5491
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5492 5492
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5493
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
5493
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5494 5494
 
5495 5495
   cat > conftest.$ac_ext <<EOF
5496 5496
 #include "confdefs.h"

+ 2
- 2
krename/Makefile.am View File

@@ -18,8 +18,8 @@ bin_PROGRAMS = krename
18 18
 
19 19
 # the application source, library search path, and link libraries
20 20
 
21
-krename_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
22
-krename_LDADD =$(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
21
+krename_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
22
+krename_LDADD =$(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET)
23 23
 
24 24
 noinst_HEADERS = ProgressDialog.h dateplugin.h fileplugin.h kmylistbox.h krenameimpl.h \
25 25
 		 pictureplugin.h tabs.h batchrenamer.h datetime.h firststartdlg.h \

Loading…
Cancel
Save