Browse Source

LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 11 months ago
parent
commit
f8607c0162
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 21 additions and 21 deletions
  1. 9
    9
      acinclude.m4
  2. 9
    9
      aclocal.m4
  3. 1
    1
      microbe/Makefile.am
  4. 2
    2
      src/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -1587,19 +1587,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG

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
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(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"
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break
fi
done

AC_SUBST(LIB_QT)
AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE)

AC_SUBST(kde_qtver)
@@ -2097,7 +2097,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)")
@@ -5234,8 +5234,8 @@ AC_DEFUN([AC_PATH_QTOPIA],

AC_MSG_CHECKING([for Qtopia])

LIB_QTOPIA="-lqpe"
AC_SUBST(LIB_QTOPIA)
LIB_TQTOPIA="-lqpe"
AC_SUBST(LIB_TQTOPIA)

kde_qtopia_dirs="$QPEDIR /opt/Qtopia"

@@ -5282,7 +5282,7 @@ is required.])

CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
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
#include "confdefs.h"

+ 9
- 9
aclocal.m4 View File

@@ -1599,19 +1599,19 @@ AC_PATH_QT_MOC_UIC
KDE_CHECK_QT_JPEG

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
LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(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"
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
break
fi
done

AC_SUBST(LIB_QT)
AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE)

AC_SUBST(kde_qtver)
@@ -2109,7 +2109,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)")
@@ -5246,8 +5246,8 @@ AC_DEFUN([AC_PATH_QTOPIA],

AC_MSG_CHECKING([for Qtopia])

LIB_QTOPIA="-lqpe"
AC_SUBST(LIB_QTOPIA)
LIB_TQTOPIA="-lqpe"
AC_SUBST(LIB_TQTOPIA)

kde_qtopia_dirs="$QPEDIR /opt/Qtopia"

@@ -5294,7 +5294,7 @@ is required.])

CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
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
#include "confdefs.h"

+ 1
- 1
microbe/Makefile.am View File

@@ -1,7 +1,7 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
bin_PROGRAMS = microbe
microbe_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
microbe_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
microbe_SOURCES = btreebase.cpp btreenode.cpp main.cpp traverser.cpp \
expression.cpp pic14.cpp variable.cpp optimizer.cpp instruction.cpp microbe.cpp \
parser.cpp

+ 2
- 2
src/Makefile.am View File

@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts \
-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)

# the library search path.
ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP $(LIB_TDEPARTS) $(LIB_GPSIM)
ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP $(LIB_TDEPARTS) $(LIB_GPSIM)

# the libraries to link against.
ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
@@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_TQT) $(LIB_GPSIM)

# which sources should be compiled for ktechlab
ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \

Loading…
Cancel
Save