--- Makefile.orig	Sat Aug 12 03:31:54 2000
+++ Makefile	Sat Sep 23 06:33:52 2000
@@ -7,13 +7,15 @@
 
 ####### Compiler, tools and options
 
-CC	=	g++
-CFLAGS	=	-Wall -W -O2 -fno-strength-reduce
-INCPATH	=	-I$(QTDIR)/include
-LINK	=	g++
-LFLAGS	=	-static
-LIBS	=	-L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
-MOC	=	moc
+CC	?=	gcc
+CXX	?=	g++
+CFLAGS	?=	-Wall -W -O2 -fno-strength-reduce
+CXXFLAGS?=	-Wall -W -O2 -fno-strength-reduce
+INCPATH	=	-I$(QTDIR)/include/qt2
+LINK	=	$(CXX)
+LFLAGS	=	
+LIBS	=	-L$(QTDIR)/lib -lqt2
+MOC	=	$(QTDIR)/bin/moc2
 
 ####### Files
 
@@ -351,16 +353,16 @@
 .SUFFIXES: .cpp .cxx .cc .C .c
 
 .cpp.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cxx.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .cc.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .C.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<