summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:03 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:03 +0900
commitf0e2cb3e0bbf5d855a6106359778bce2bd9c61bb (patch)
tree41034f48aa950385be3d5d2265062246bdcab388
parent9ca495bd2717a0d0653cdd227b2682ac4fc0cd9c (diff)
downloadlibtqt-perl-f0e2cb3e.tar.gz
libtqt-perl-f0e2cb3e.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--Makefile.in2
-rw-r--r--PerlTQt/Makefile.PL.in2
-rw-r--r--acinclude.m410
-rw-r--r--aclocal.m410
-rw-r--r--puic/Makefile.am2
-rw-r--r--puic/Makefile.in4
-rw-r--r--smoke/Makefile.in2
-rw-r--r--smoke/tqt/Makefile.am2
-rw-r--r--smoke/tqt/Makefile.in4
-rw-r--r--smoke/tqt/qtguess.pl.in2
10 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in
index 3a1b585..f228cff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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@
diff --git a/PerlTQt/Makefile.PL.in b/PerlTQt/Makefile.PL.in
index d1867d5..efa6618 100644
--- a/PerlTQt/Makefile.PL.in
+++ b/PerlTQt/Makefile.PL.in
@@ -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);
diff --git a/acinclude.m4 b/acinclude.m4
index 4f6389e..738d566 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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)")
diff --git a/aclocal.m4 b/aclocal.m4
index f30dfb0..7f53f96 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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)")
diff --git a/puic/Makefile.am b/puic/Makefile.am
index b0d7d8b..92dd4ae 100644
--- a/puic/Makefile.am
+++ b/puic/Makefile.am
@@ -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
diff --git a/puic/Makefile.in b/puic/Makefile.in
index 25a3e00..58ca1b9 100644
--- a/puic/Makefile.in
+++ b/puic/Makefile.in
@@ -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
diff --git a/smoke/Makefile.in b/smoke/Makefile.in
index 2df970f..029a3cd 100644
--- a/smoke/Makefile.in
+++ b/smoke/Makefile.in
@@ -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@
diff --git a/smoke/tqt/Makefile.am b/smoke/tqt/Makefile.am
index 3614181..ac15f27 100644
--- a/smoke/tqt/Makefile.am
+++ b/smoke/tqt/Makefile.am
@@ -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 \
diff --git a/smoke/tqt/Makefile.in b/smoke/tqt/Makefile.in
index d2e8932..6f4d628 100644
--- a/smoke/tqt/Makefile.in
+++ b/smoke/tqt/Makefile.in
@@ -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 \
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index 9f6d011..7174567 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -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@';