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
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
1587 1587
 KDE_CHECK_QT_JPEG
1588 1588
 
1589 1589
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1590
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1590
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1591 1591
 else
1592
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1592
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1593 1593
 fi
1594
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1594
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1595 1595
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1596 1596
   if test -e "$a"; then
1597
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1597
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1598 1598
      break
1599 1599
   fi
1600 1600
 done
1601 1601
 
1602
-AC_SUBST(LIB_QT)
1602
+AC_SUBST(LIB_TQT)
1603 1603
 AC_SUBST(LIB_QPE)
1604 1604
 
1605 1605
 AC_SUBST(kde_qtver)
@@ -2097,7 +2097,7 @@ elif test $kde_qtver = 2; then
2097 2097
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2098 2098
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2099 2099
 else
2100
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2100
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2101 2101
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2102 2102
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2103 2103
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5234,8 +5234,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
5234 5234
 
5235 5235
   AC_MSG_CHECKING([for Qtopia])
5236 5236
 
5237
-  LIB_QTOPIA="-lqpe"
5238
-  AC_SUBST(LIB_QTOPIA)
5237
+  LIB_TQTOPIA="-lqpe"
5238
+  AC_SUBST(LIB_TQTOPIA)
5239 5239
 
5240 5240
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
5241 5241
 
@@ -5282,7 +5282,7 @@ is required.])
5282 5282
 
5283 5283
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5284 5284
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5285
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
5285
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5286 5286
 
5287 5287
   cat > conftest.$ac_ext <<EOF
5288 5288
 #include "confdefs.h"

+ 9
- 9
aclocal.m4 View File

@@ -1599,19 +1599,19 @@ AC_PATH_QT_MOC_UIC
1599 1599
 KDE_CHECK_QT_JPEG
1600 1600
 
1601 1601
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
1602
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1602
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
1603 1603
 else
1604
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1604
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
1605 1605
 fi
1606
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
1606
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
1607 1607
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
1608 1608
   if test -e "$a"; then
1609
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
1609
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
1610 1610
      break
1611 1611
   fi
1612 1612
 done
1613 1613
 
1614
-AC_SUBST(LIB_QT)
1614
+AC_SUBST(LIB_TQT)
1615 1615
 AC_SUBST(LIB_QPE)
1616 1616
 
1617 1617
 AC_SUBST(kde_qtver)
@@ -2109,7 +2109,7 @@ elif test $kde_qtver = 2; then
2109 2109
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2110 2110
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2111 2111
 else
2112
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2112
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
2113 2113
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2114 2114
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2115 2115
    AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5246,8 +5246,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
5246 5246
 
5247 5247
   AC_MSG_CHECKING([for Qtopia])
5248 5248
 
5249
-  LIB_QTOPIA="-lqpe"
5250
-  AC_SUBST(LIB_QTOPIA)
5249
+  LIB_TQTOPIA="-lqpe"
5250
+  AC_SUBST(LIB_TQTOPIA)
5251 5251
 
5252 5252
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
5253 5253
 
@@ -5294,7 +5294,7 @@ is required.])
5294 5294
 
5295 5295
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
5296 5296
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
5297
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
5297
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
5298 5298
 
5299 5299
   cat > conftest.$ac_ext <<EOF
5300 5300
 #include "confdefs.h"

+ 1
- 1
microbe/Makefile.am View File

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

+ 2
- 2
src/Makefile.am View File

@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts \
11 11
 	-I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
12 12
 
13 13
 # the library search path. 
14
-ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP $(LIB_TDEPARTS) $(LIB_GPSIM)
14
+ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP $(LIB_TDEPARTS) $(LIB_GPSIM)
15 15
 
16 16
 # the libraries to link against.
17 17
 ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
@@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
19 19
 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
20 20
 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
21 21
 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
22
-	$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
22
+	$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_TQT) $(LIB_GPSIM)
23 23
 
24 24
 # which sources should be compiled for ktechlab
25 25
 ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \

Loading…
Cancel
Save