[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2289: devchk had some manual workarounds for qt3 oddities, dropping

Mats Wichmann mats at linuxfoundation.org
Tue May 22 12:59:09 UTC 2012


------------------------------------------------------------
revno: 2289
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Tue 2012-05-22 06:59:09 -0600
message:
  devchk had some manual workarounds for qt3 oddities, dropping
modified:
  ts/devchk/cflags.mk
  ts/devchk/makefile
  ts/devchk/mktests
-------------- next part --------------
=== modified file 'ts/devchk/cflags.mk'
--- a/ts/devchk/cflags.mk	2012-04-27 16:14:38 +0000
+++ b/ts/devchk/cflags.mk	2012-05-22 12:59:09 +0000
@@ -52,15 +52,10 @@
     -I/usr/include/libxml2 \
     -I/usr/include/fontconfig \
     -I/usr/include/cairo \
-    -I/usr/lib64/qt3/include \
-    -I/usr/lib/qt3/include \
     -I/usr/lib/qt4/include \
     -I/usr/include/qt4 \
-    -I/usr/include/qt3 \
     -I/usr/lib/qt4/include/QtCore \
     -I/usr/include/QtCore \
-    -I/usr/lib64/qt-3.3/include \
-    -I/usr/lib/qt-3.3/include \
     -I/opt/gnome/include \
     -I/opt/gnome/include/atk-1.0 \
     -I/opt/gnome/include/glib-2.0 \

=== modified file 'ts/devchk/makefile'
--- a/ts/devchk/makefile	2012-04-26 14:57:22 +0000
+++ b/ts/devchk/makefile	2012-05-22 12:59:09 +0000
@@ -669,7 +669,7 @@
 all: hdrchk
 
 hdrchk: $(OBJS)
-	$(CXX) -o hdrchk $(OBJS) $(EXTRALIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -L/usr/lib/qt3/lib64 -L/usr/lib/qt3/lib -L/usr/lib64/qt-3.3/lib -L/usr/lib/qt-3.3/lib -L/opt/gnome/lib64 -L/opt/gnome/lib -lXt -lX11 -lncurses -lqt-mt -lrt -lxml2 -lglib-2.0 -lgdk-x11-2.0 -lgtk-x11-2.0
+	$(CXX) -o hdrchk $(OBJS) $(EXTRALIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -L/opt/gnome/lib64 -L/opt/gnome/lib -lXt -lX11 -lncurses -lrt -lxml2 -lglib-2.0 -lgdk-x11-2.0 -lgtk-x11-2.0
 
 hdrchk.o: hdrchk.c
 	$(CC) $(CFLAGS) -g -c hdrchk.c

=== modified file 'ts/devchk/mktests'
--- a/ts/devchk/mktests	2012-03-19 13:01:48 +0000
+++ b/ts/devchk/mktests	2012-05-22 12:59:09 +0000
@@ -2057,7 +2057,7 @@
 
 print MAKEFILE "all: hdrchk\n\n";
 print MAKEFILE "hdrchk: \$\(OBJS)\n";
-print MAKEFILE "\t\$(CXX) -o hdrchk \$(OBJS) \$(EXTRALIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -L/usr/lib/qt3/lib64 -L/usr/lib/qt3/lib -L/usr/lib64/qt-3.3/lib -L/usr/lib/qt-3.3/lib -L/opt/gnome/lib64 -L/opt/gnome/lib -lXt -lX11 -lncurses -lqt-mt -lrt -lxml2 -lglib-2.0 -lgdk-x11-2.0 -lgtk-x11-2.0\n";
+print MAKEFILE "\t\$(CXX) -o hdrchk \$(OBJS) \$(EXTRALIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -L/opt/gnome/lib64 -L/opt/gnome/lib -lXt -lX11 -lncurses -lrt -lxml2 -lglib-2.0 -lgdk-x11-2.0 -lgtk-x11-2.0\n";
 print MAKEFILE "\n";
 print MAKEFILE "hdrchk.o: hdrchk.c\n";
 print MAKEFILE "\t\$(CC) \$\(CFLAGS) -g -c hdrchk.c\n";



More information about the lsb-messages mailing list