TDE
/
knemo
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knemo
0
0
Fork 0
Code Issues Releases Wiki Activity

LIB_QT -> LIB_TQT conversion to align to updated admin module

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 203c3d77ef
commit 8b1b3a64d6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

18
acinclude.m4
Unescape View File

@ -1577,19 +1577,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG KDE_CHECK_QT_JPEG
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then 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 else
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
fi 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 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then if test -e "$a"; then
LIB_QT="$LIB_QT ${kde_int_qt}_incremental" LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break break
fi fi
done done
AC_SUBST(LIB_QT) AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE) AC_SUBST(LIB_QPE)
AC_SUBST(kde_qtver) AC_SUBST(kde_qtver)
@ -2101,7 +2101,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else 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_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@ -5443,8 +5443,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
AC_MSG_CHECKING([for Qtopia]) AC_MSG_CHECKING([for Qtopia])
LIB_QTOPIA="-lqpe" LIB_TQTOPIA="-lqpe"
AC_SUBST(LIB_QTOPIA) AC_SUBST(LIB_TQTOPIA)
kde_qtopia_dirs="$QPEDIR /opt/Qtopia" kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
@ -5491,7 +5491,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" 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 cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"

2
src/kcm/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../common -I$(srcdir)/../knemod/backends $(all_includes)
kcm_knemo_la_LDFLAGS = -module -avoid-version $(all_libraries) kcm_knemo_la_LDFLAGS = -module -avoid-version $(all_libraries)
# the libraries to link against. # the libraries to link against.
kcm_knemo_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP kcm_knemo_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) -lDCOP
# which sources should be compiled for knemo # which sources should be compiled for knemo
kcm_knemo_la_SOURCES = configdialog.cpp configdlg.ui kcm_knemo_la_SOURCES = configdialog.cpp configdlg.ui

2
src/knemod/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ INCLUDES = -I$(srcdir)/../common -I$(srcdir)/backends $(all_includes)
kded_knemod_la_LDFLAGS = -module -avoid-version $(all_libraries) kded_knemod_la_LDFLAGS = -module -avoid-version $(all_libraries)
# the libraries to link against. # the libraries to link against.
kded_knemod_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP -ltdeinit_kded backends/libknemo_backends.la kded_knemod_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP -ltdeinit_kded backends/libknemo_backends.la
# which sources should be compiled for knemo # which sources should be compiled for knemo
kded_knemod_la_SOURCES = knemodaemon.cpp knemodaemon.skel interface.cpp \ kded_knemod_la_SOURCES = knemodaemon.cpp knemodaemon.skel interface.cpp \

Write Preview
Loading…
Cancel
Save