LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
bug/266/move-to-usr
Michele Calgaro 6 years ago
parent 9ca495bd27
commit f0e2cb3e0b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -105,7 +105,7 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
LIB_POLL = @LIB_POLL@
LIB_TQPE = @LIB_TQPE@
LIB_QT = @LIB_QT@
LIB_TQT = @LIB_TQT@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@

@ -22,7 +22,7 @@ $x{'X_PRE_LIBS'} = '@X_PRE_LIBS@';
interpolate('LIB_X11', 'exec_prefix', 'libdir', 'datadir');
my $objects='TQt$(OBJ_EXT) handlers$(OBJ_EXT)';
my $qtlib ='@LIB_QT@';
my $qtlib ='@LIB_TQT@';
interpolate(\$qtlib);

@ -1495,13 +1495,13 @@ AC_PATH_TQT_TQMOC_UIC
KDE_CHECK_TQT_JPEG
if test "x$kde_use_qt_emb" != "xyes"; then
LIB_QT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)'
else
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBPNG)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBPNG)'
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"
AC_SUBST(LIB_QT)
AC_SUBST(LIB_TQT)
AC_SUBST(LIB_TQPE)
AC_SUBST(kde_qtver)
@ -1986,7 +1986,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
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_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")

10
aclocal.m4 vendored

@ -1507,13 +1507,13 @@ AC_PATH_TQT_TQMOC_UIC
KDE_CHECK_TQT_JPEG
if test "x$kde_use_qt_emb" != "xyes"; then
LIB_QT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)'
else
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBPNG)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBPNG)'
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"
AC_SUBST(LIB_QT)
AC_SUBST(LIB_TQT)
AC_SUBST(LIB_TQPE)
AC_SUBST(kde_qtver)
@ -1998,7 +1998,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
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_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")

@ -4,7 +4,7 @@ AM_CXXFLAGS= $(KDE_CXXFLAGS)
bin_PROGRAMS = puic
puic_SOURCES = widgetdatabase.cpp uic.cpp subclassing.cpp parser.cpp object.cpp main.cpp form.cpp embed.cpp domtool.cpp
puic_LDADD = $(LIB_QT) $(LIBZ)
puic_LDADD = $(LIB_TQT) $(LIBZ)
man_MANS = puic.1

@ -105,7 +105,7 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
LIB_POLL = @LIB_POLL@
LIB_TQPE = @LIB_TQPE@
LIB_QT = @LIB_QT@
LIB_TQT = @LIB_TQT@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@
@ -199,7 +199,7 @@ AM_CXXFLAGS = $(KDE_CXXFLAGS)
bin_PROGRAMS = puic
puic_SOURCES = widgetdatabase.cpp uic.cpp subclassing.cpp parser.cpp object.cpp main.cpp form.cpp embed.cpp domtool.cpp
puic_LDADD = $(LIB_QT) $(LIBZ)
puic_LDADD = $(LIB_TQT) $(LIBZ)
man_MANS = puic.1

@ -105,7 +105,7 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
LIB_POLL = @LIB_POLL@
LIB_TQPE = @LIB_TQPE@
LIB_QT = @LIB_QT@
LIB_TQT = @LIB_TQT@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@

@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
# the libraries to link against.
libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
libsmoketqt_la_LIBADD = $(LIB_TQT) $(GL_LIBS)
# which sources should be compiled for perlqtkde
libsmoketqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \

@ -105,7 +105,7 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
LIB_POLL = @LIB_POLL@
LIB_TQPE = @LIB_TQPE@
LIB_QT = @LIB_QT@
LIB_TQT = @LIB_TQT@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@
@ -206,7 +206,7 @@ EXTRA_DIST = generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am Makefile.in
libsmoketqt_la_LDFLAGS = -version-info 3:1:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(GL_CFLAGS) $(KDE_RPATH)
# the libraries to link against.
libsmoketqt_la_LIBADD = $(LIB_QT) $(GL_LIBS)
libsmoketqt_la_LIBADD = $(LIB_TQT) $(GL_LIBS)
# which sources should be compiled for perlqtkde
libsmoketqt_la_SOURCES = smokedata.cpp x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \

@ -38,7 +38,7 @@ my $tmp = gettmpfile();
my $qtinc = '@qt_includes@';
my $allinc = '@all_includes@';
my $alllib = '@all_libraries@';
my $qtflags ='@LIB_QT@';
my $qtflags ='@LIB_TQT@';
my %x;
$x{'LIBPNG'} = '@LIBPNG@';
$x{'LIBJPEG'} = '@LIBJPEG@';

Loading…
Cancel
Save