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
62f0273dc0
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 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"

+ 1
- 1
plugin/Makefile.am View File

@@ -5,7 +5,7 @@ konqsidebar_smb4k_la_SOURCES = smb4k_konqplugin.cpp
5 5
 konqsidebar_smb4k_la_LDFLAGS = -module $(all_libraries) \
6 6
 	-L$(top_builddir)/smb4k/core -L$(topbuild_dir)/smb4k/widgets -lkonqsidebarplugin
7 7
 konqsidebar_smb4k_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
8
-	$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) \
8
+	$(KDE_PLUGIN) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) \
9 9
 	$(LIB_TDEUI)
10 10
 
11 11
 globaladddir   = $(kde_datadir)/konqsidebartng/add

+ 2
- 2
smb4k/Makefile.am View File

@@ -8,8 +8,8 @@ bin_PROGRAMS = smb4k
8 8
 
9 9
 smb4k_SOURCES = main.cpp smb4k.cpp smb4ksystemtray.cpp
10 10
 smb4k_LDADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
11
-	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT)
12
-smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
11
+	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT)
12
+smb4k_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
13 13
 
14 14
 
15 15
 KDE_ICON = smb4k

+ 1
- 1
smb4k/browser/Makefile.am View File

@@ -8,7 +8,7 @@ libsmb4knetworkbrowser_la_SOURCES = smb4knetworkbrowser_part.cpp \
8 8
 		smb4knetworkbrowsertooltip.cpp
9 9
 libsmb4knetworkbrowser_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
10 10
 	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDECORE) \
11
-	$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
11
+	$(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT)
12 12
 libsmb4knetworkbrowser_la_LDFLAGS = -module -no-undefined $(all_libraries)
13 13
 
14 14
 partrcdir = $(kde_datadir)/smb4knetworkbrowserpart

+ 1
- 1
smb4k/configdlg/Makefile.am View File

@@ -8,5 +8,5 @@ libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp
8 8
 	smb4knetworkoptions.cpp smb4tdersyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \
9 9
 	smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp
10 10
 libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
11
-	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
11
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT)
12 12
 libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_TDEFILE)

+ 1
- 1
smb4k/core/Makefile.am View File

@@ -18,7 +18,7 @@ libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
18 18
 	smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
19 19
 	smb4ksambaoptionsinfo.cpp smb4kscanner.cpp smb4kscanner_p.cpp smb4ksettings.kcfgc smb4kshare.cpp \
20 20
 	smb4ksynchronizationinfo.cpp smb4ksynchronizer.cpp
21
-libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT)
21
+libsmb4kcore_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT)
22 22
 
23 23
 kde_kcfg_DATA = smb4k.kcfg
24 24
 

+ 1
- 1
smb4k/dialogs/Makefile.am View File

@@ -6,6 +6,6 @@ libsmb4kdialogs_la_SOURCES = smb4kbookmarkeditor.cpp \
6 6
 	smb4kcustomoptionsdialog.cpp smb4kmountdialog.cpp smb4kpreviewdialog.cpp smb4kprintdialog.cpp \
7 7
 	smb4ksynchronizationdialog.cpp
8 8
 libsmb4kdialogs_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
9
-	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT)
9
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT)
10 10
 noinst_HEADERS = smb4kbookmarkeditor.h smb4kmountdialog.h smb4kpreviewdialog.h \
11 11
 	smb4kprintdialog.h smb4ksynchronizationdialog.h

+ 1
- 1
smb4k/iconview/Makefile.am View File

@@ -10,7 +10,7 @@ noinst_HEADERS = smb4ksharesiconview.h smb4ksharesiconview_part.h \
10 10
 		smb4ksharesiconviewitem.h smb4ksharesiconviewtooltip.h
11 11
 libsmb4ksharesiconview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
12 12
 	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
13
-	$(LIB_QT)
13
+	$(LIB_TQT)
14 14
 
15 15
 partrcdir = $(kde_datadir)/smb4ksharesiconviewpart
16 16
 partrc_DATA = smb4ksharesiconview_part.rc

+ 1
- 1
smb4k/listview/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO
4 4
 kde_module_LTLIBRARIES = libsmb4kshareslistview.la
5 5
 libsmb4kshareslistview_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
6 6
 	$(top_builddir)/smb4k/dialogs/libsmb4kdialogs.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) \
7
-	$(LIB_QT)
7
+	$(LIB_TQT)
8 8
 libsmb4kshareslistview_la_LDFLAGS = -module -no-undefined $(all_libraries)
9 9
 
10 10
 partrcdir = $(kde_datadir)/smb4kshareslistviewpart

+ 1
- 1
smb4k/searchdlg/Makefile.am View File

@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
2 2
 METASOURCES = AUTO
3 3
 kde_module_LTLIBRARIES = libsmb4ksearchdialog.la
4 4
 libsmb4ksearchdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \
5
-	$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_QT)
5
+	$(LIB_TDECORE) $(LIB_TDEUI) $(KDE_PLUGIN) $(LIB_TDEPARTS) $(LIB_TQT)
6 6
 noinst_HEADERS = smb4ksearchdialog.h smb4ksearchdialog_part.h \
7 7
 	smb4ksearchdialogitem.h
8 8
 libsmb4ksearchdialog_la_SOURCES = smb4ksearchdialog.cpp \

Loading…
Cancel
Save