--- src/Makefile.orig	Tue Jul 17 16:05:53 2001
+++ src/Makefile	Sun Jul 29 20:17:58 2001
@@ -1,7 +1,6 @@
-CC = gcc
-CFLAGS = -g -Wall `gtk-config --cflags`
-
-LIBS = `gtk-config --libs` -lgtkgl -lGL -lGLU -lm -L/usr/X11R6/lib -lXi -lXmu
+CFLAGS += -g -Wall `${GTK_CONFIG} --cflags` $(INCLDIR) ${PTHREAD_CFLAGS}
+INCLDIR = -I${X11BASE}/include -I${LOCALBASE}/include
+LIBS = `${GTK_CONFIG} --libs` -L${X11BASE}/lib -lgtkgl -lGL -lGLU -lm -lXi -lXmu ${PTHREAD_LIBS}
 
 OBJS =	main.o		\
 	animation.o	\