--- dlib/test/makefile.orig	2012-12-10 23:56:00.000000000 +0000
+++ dlib/test/makefile	2012-12-10 23:59:07.000000000 +0000
@@ -5,14 +5,15 @@
 TARGET = test 
 
 # these are the compile time flags passed to gcc
-CFLAGS = -ggdb  -DDEBUG -DDLIB_NO_GUI_SUPPORT  -I ../..  -Wall
+CPPFLAGS :=    -DDEBUG -DDLIB_NO_GUI_SUPPORT -I../..
+CXXFLAGS := -ggdb -Wall
 
 # These are the link time flags passed to gcc
 LFLAGS = -lpthread   -lnsl 
 
 # The name of the compiler.  If you only have one version of
 # gcc installed then you probably want to change this to just g++ 
-CC = nice g++
+CXX := nice g++
 
 ####################################################
 ####################################################
@@ -146,13 +147,9 @@
 
 $(TARGET): $(OBJ) 
 	@echo Linking $@
-	@$(CC) $(OBJ) $(LFLAGS) -o $@
+	@$(CXX) $(LDFLAGS) $(OBJ) $(LFLAGS) -o $@
 	@echo Build Complete
 
-.cpp.o: $<
-	@echo Compiling $<
-	@$(CC) -c $(CFLAGS) $< -o $@
-
 clean:
 	@rm -f $(OBJ) $(TARGET)
 	@echo All object files and binaries removed