Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 6 months ago
parent
commit
e94f1bd9cf
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
      bibletime/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -1578,19 +1578,19 @@ AC_PATH_QT_MOC_UIC
1578 1578
 KDE_CHECK_QT_JPEG
1579 1579
 
1580 1580
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1581
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1581
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1582 1582
 else
1583
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1583
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1584 1584
 fi
1585
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1585
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1586 1586
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1587 1587
   if test -e "$a"; then
1588
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1588
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1589 1589
      break
1590 1590
   fi
1591 1591
 done
1592 1592
 
1593
-AC_SUBST(LIB_QT)
1593
+AC_SUBST(LIB_TQT)
1594 1594
 AC_SUBST(LIB_QPE)
1595 1595
 
1596 1596
 AC_SUBST(kde_qtver)
@@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
2096 2096
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2097 2097
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2098 2098
 else
2099
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2099
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2100 2100
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2101 2101
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2102 2102
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5225,8 +5225,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
5225 5225
 
5226 5226
   AC_MSG_CHECKING([for Qtopia])
5227 5227
 
5228
-  LIB_QTOPIA="-lqpe"
5229
-  AC_SUBST(LIB_QTOPIA)
5228
+  LIB_TQTOPIA="-lqpe"
5229
+  AC_SUBST(LIB_TQTOPIA)
5230 5230
 
5231 5231
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
5232 5232
 
@@ -5273,7 +5273,7 @@ is required.])
5273 5273
 
5274 5274
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5275 5275
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5276
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
5276
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5277 5277
 
5278 5278
   cat > conftest.$ac_ext <<EOF
5279 5279
 #include "confdefs.h"

+ 2
- 2
bibletime/Makefile.am View File

@@ -12,7 +12,7 @@ bibletime_LDADD   = \
12 12
 ./backend/libbackend.a \
13 13
 ./util/libutil.a \
14 14
 -lXext \
15
-$(LIB_QT) \
15
+$(LIB_TQT) \
16 16
 $(LIB_TDECORE) \
17 17
 $(LIB_TDEUI) \
18 18
 -ltdeprint \
@@ -54,7 +54,7 @@ bin_PROGRAMS = bibletime
54 54
 bibletime_METASOURCES = AUTO
55 55
 
56 56
 # the library search path. 
57
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
57
+bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
58 58
 
59 59
 # them while "make clean", use CLEANFILES
60 60
 DISTCLEANFILES = $(bibletime_METASOURCES)

Loading…
Cancel
Save