Revert to QT3 header files

diff --git a/tools/Display/Makefile b/tools/Display/Makefile
index 2e43f570be5808ea5102b68312a6d5a3bb388dc4..c1bb2b626a37bf6f309710b8e9ef55b993d1f15d 100644 (file)
--- a/tools/Display/Makefile
+++ b/tools/Display/Makefile
@@ -15,17 +15,15 @@ CXX =       g++
 CFLAGS =       -pipe -Wno-deprecated -O2 -DNO_DEBUG
 # CXXFLAGS=    -g -pipe -Wno-deprecated -Wall -W -O2 -std=c++98
 CXXFLAGS=      -pipe -Wno-deprecated -O2 -DNO_DEBUG -std=c++98
-QTINCDIR=-I/usr/include/qt4 -I/usr/include/qt4/Qt
 
-QTLIBDIR=/usr/lib/qt4
 SNARK14ROOT = ../..
 SNARK14LIB = $(SNARK14ROOT)/lib
 SNARK14INC = $(SNARK14ROOT)/include
 
-XERCES = /usr/local/snark14
+XERCES = ../..
 XERCESLIBDIR= $(XERCES)/lib
 XERCESLIB = xerces-c
-XERCESINCLUDE = $(XERCES)/include/xercesc
+XERCESINCLUDE = $(XERCES)/include
 
 DIGLIBDIR = $(SNARK14LIB)
 
@@ -35,10 +33,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
 DIGFILESNARKLIB = DIGFileSnark
 DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
 
-INCPATH        =       $(QTINCDIR) -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I../../include
+INCPATH        =       -I$(QTDIR)/include -I$(XERCESINCLUDE) -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
 LINK   =       $(CXX) -std=c++98
 LFLAGS =       
-LIBS   =       $(SUBLIBS) -L$(QTLIBDIR) -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
+LIBS   =       $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
 MOC    =       $(QTDIR)/bin/moc
 UIC    =       $(QTDIR)/bin/uic
 TAR    =       tar -cf