--- Makefile.orig	Fri Dec  3 16:45:01 1999
+++ Makefile	Mon Aug 27 11:42:28 2001
@@ -7,15 +7,14 @@
 
 ####### Compiler, tools and options
 
-CC	=	gcc
-CXX	=	g++
-CFLAGS	=	-pipe -Wall -W -O3 -DLINCVS_APP
-CXXFLAGS=	-pipe -Wall -W -O3 -DLINCVS_APP
-INCPATH	=	-I./include -I./res -I./themes/include -I./themes/res -I$(QTDIR)/include
-LINK	=	g++
+#CC	=	gcc
+#CXX	=	g++
+DEFS	=	-D_REENTRANT -DLINCVS_APP -DNO_DEBUG
+INCPATH	=	-I./include -I./res -I./themes/include -I./themes/res -I${MODQT_INCDIR}
+LINK	=	$(CXX)
 LFLAGS	=	
-LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lXext -lX11 -lm
-MOC	=	moc
+LIBS	=	-L$(MODQT_LIBDIR) -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm
+MOC	=	$(LOCALBASE)/bin/moc2
 
 TAR	=	tar -cf
 GZIP	=	gzip -9f
@@ -69,19 +68,19 @@ TARGET	=	LinCVS
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
 
 .cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
 
 .cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
 
 .C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) ${DEFS} $(INCPATH) -o $@ $<
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+	$(CC) -c $(CFLAGS) ${DEFS} $(INCPATH) -o $@ $<
 
 ####### Build rules
 
