--- Makefile.orig	Sun Jan  2 18:33:01 2000
+++ Makefile	Thu Mar 15 11:29:59 2001
@@ -1,4 +1,5 @@
-
+CC=gcc
+CXX=g++
 CFLAGS=-g
 
 all: gtkpool
@@ -13,22 +14,22 @@ run: gtkpool
 	./gtkpool
 
 gtkpool: $(OBJS)
-	g++ $(OBJS) $(CFLAGS) -o gtkpool `gtk-config --libs`
+	$(CXX) $(LDFLAGS) $(OBJS) $(CFLAGS) -o gtkpool `gtk-config --libs`
 
 popt.o:
-	gcc -c popt.c -o popt.o 
+	$(CC) -c popt.c -o popt.o 
 
 gui.o: gui.cc application.hh pool.hh myconfig.hh options.hh
-	g++ $(CFLAGS) -c gui.cc -o gui.o $(GTKFLAGS)
+	$(CXX) $(CFLAGS) -c gui.cc -o gui.o $(GTKFLAGS)
 
 application.o: application.cc application.hh pool.hh myconfig.hh sound.hh
-	g++ $(CFLAGS) -c application.cc -o application.o $(GTKFLAGS)
+	$(CXX) $(CFLAGS) -c application.cc -o application.o $(GTKFLAGS)
 
 pool.o: pool.cc pool.hh myconfig.hh
-	g++ $(CFLAGS) -c pool.cc -o pool.o $(GTKFLAGS)
+	$(CXX) $(CFLAGS) -c pool.cc -o pool.o $(GTKFLAGS)
 
 options.o: options.cc options.hh application.hh
-	g++ $(CFLAGS) -c options.cc -o options.o $(GTKFLAGS)
+	$(CXX) $(CFLAGS) -c options.cc -o options.o $(GTKFLAGS)
 
 sound.o: sound.cc sound.hh
-	g++ $(CFLAGS) -c sound.cc -o sound.o $(GTKFLAGS)
+	$(CXX) $(CFLAGS) -c sound.cc -o sound.o $(GTKFLAGS)
