Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 5 months ago
parent
commit
497e51a479
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 11 additions and 11 deletions
  1. 9
    9
      acinclude.m4
  2. 1
    1
      kdirstat.kdevprj
  3. 1
    1
      kdirstat/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -1561,19 +1561,19 @@ AC_PATH_QT_MOC_UIC
1561 1561
 KDE_CHECK_QT_JPEG
1562 1562
 
1563 1563
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1564
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1564
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1565 1565
 else
1566
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1566
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1567 1567
 fi
1568
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1568
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1569 1569
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1570 1570
   if test -e "$a"; then
1571
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1571
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1572 1572
      break
1573 1573
   fi
1574 1574
 done
1575 1575
 
1576
-AC_SUBST(LIB_QT)
1576
+AC_SUBST(LIB_TQT)
1577 1577
 AC_SUBST(LIB_QPE)
1578 1578
 
1579 1579
 AC_SUBST(kde_qtver)
@@ -2044,7 +2044,7 @@ elif test $kde_qtver = 2; then
2044 2044
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2045 2045
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2046 2046
 else
2047
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2047
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2048 2048
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2049 2049
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2050 2050
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5034,8 +5034,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
5034 5034
 
5035 5035
   AC_MSG_CHECKING([for Qtopia])
5036 5036
 
5037
-  LIB_QTOPIA="-lqpe"
5038
-  AC_SUBST(LIB_QTOPIA)
5037
+  LIB_TQTOPIA="-lqpe"
5038
+  AC_SUBST(LIB_TQTOPIA)
5039 5039
 
5040 5040
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
5041 5041
 
@@ -5082,7 +5082,7 @@ is required.])
5082 5082
 
5083 5083
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5084 5084
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5085
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
5085
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5086 5086
 
5087 5087
   cat > conftest.$ac_ext <<EOF
5088 5088
 #include "confdefs.h"

+ 1
- 1
kdirstat.kdevprj View File

@@ -16,7 +16,7 @@ type=DATA
16 16
 [Config for BinMakefileAm]
17 17
 bin_program=kdirstat
18 18
 cxxflags=-O0 -g3 -Wall
19
-ldadd=$(LIB_TDEFILE) -ltdeui -ltdecore $(LIB_QT)
19
+ldadd=$(LIB_TDEFILE) -ltdeui -ltdecore $(LIB_TQT)
20 20
 ldflags=
21 21
 [General]
22 22
 AMChanged=false

+ 1
- 1
kdirstat/Makefile.am View File

@@ -85,7 +85,7 @@ INCLUDES= $(all_includes)
85 85
 METASOURCES = AUTO
86 86
 
87 87
 # the library search path.
88
-kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
88
+kdirstat_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
89 89
 
90 90
 rcdir = $(kde_datadir)/kdirstat
91 91
 rc_DATA = kdirstatui.rc

Loading…
Cancel
Save