diff --git a/demo/jgrep/gcc.mak b/demo/jgrep/gcc.mak
index 49bd5b68..99db974b 100644
--- a/demo/jgrep/gcc.mak
+++ b/demo/jgrep/gcc.mak
@@ -3,13 +3,14 @@
 #
 # GNU compiler g++
 #
-CXX= -O2 -I../../../../ -I./
+CXX= $(INCLUDES) -O2 -I../../../../ -I./ $(CXXFLAGS) $(LDFLAGS)
 
 jgrep : jgrep.cpp main.cpp
-	g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++
+	g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++ $(LIBS)
 
 debug : jgrep.cpp main.cpp
-	g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug
+	g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug $(LIBS)
+
 
 
 
diff --git a/demo/regress/gcc.mak b/demo/regress/gcc.mak
index 2a66584d..7bbd7ed3 100644
--- a/demo/regress/gcc.mak
+++ b/demo/regress/gcc.mak
@@ -3,16 +3,17 @@
 #
 # g++ 2.95 and greater
 #
-CXX= g++ -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
+CXX= g++ $(INCLUDES) -pedantic -Wall -I../../../../ -I./ $(CXXFLAGS) -L../../lib/gcc $(LDFLAGS)
 
 total : r2
 	./r2 tests.txt
 
 r2 : tests.cpp parse.cpp regress.cpp
-	$(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++
+	$(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++ $(LIBS)
 
 debug : tests.cpp parse.cpp regress.cpp
-	$(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug
+	$(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug $(LIBS)
+