--- Makefile.orig	Sun Feb  5 04:41:46 2006
+++ Makefile	Sun Feb  5 23:05:34 2006
@@ -1,8 +1,6 @@
 PROGRAM = glpuzzle
 
-CXXFLAGS = -O2 -Wall
-INCLFLAGS = -I/usr/include/SDL
-LIBSFLAGS = -lpthread -lGL -lpthread -lpng -ljpeg -lSDL
+LIBSFLAGS = $(LDFLAGS) -lGL -lpng -ljpeg
 SOURCES = main.cxx Screen.cxx Texture.cxx Loader.cxx
 
 ENABLE_SOUND = 1
@@ -43,7 +41,7 @@
 	g++ -c $(CXXFLAGS) $(INCLFLAGS) $< -o $@ 
 
 $(PROGRAM): $(OBJECTS) 
-	g++ $(OBJECTS) $(LIBSFLAGS) -o $@
+	g++ $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) $(LIBSFLAGS) -o $@
 
 install: $(PROGRAM)
 	@echo Installing in $(PREFIX)