File xmacro-Makefile-refactoring.patch of Package xmacro

Index: xmacro-cvs/Makefile
===================================================================
--- xmacro-cvs.orig/Makefile
+++ xmacro-cvs/Makefile
@@ -1,15 +1,21 @@
 VERSION=0.3
+INC=-I/usr/X11R6/include
+LIBS=-L/usr/X11R6/lib
+LIBS2=-lXtst -lX11
+WARNINGS=-Wall -pedantic
+DEFINES=-DVERSION=$(VERSION)
+GPP=g++ $(INC) $(RPM_OPT_FLAGS) $(WARNINGS) $(DEFINES) $(LIBS)
 
 all: xmacroplay xmacrorec xmacrorec2
 
 xmacroplay: xmacroplay.cpp chartbl.h
-	g++ -O2  -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacroplay.cpp -o xmacroplay -L/usr/X11R6/lib -lXtst -lX11
+	$(GPP) xmacroplay.cpp -o xmacroplay $(LIBS2)
 
 xmacrorec: xmacrorec.cpp
-	g++ -O2  -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec.cpp -o xmacrorec -L/usr/X11R6/lib -lXtst -lX11
+	$(GPP) xmacrorec.cpp  -o xmacrorec  $(LIBS2)
 
 xmacrorec2: xmacrorec2.cpp
-	g++ -O2  -I/usr/X11R6/include -Wall -pedantic -DVERSION=$(VERSION) xmacrorec2.cpp -o xmacrorec2 -L/usr/X11R6/lib -lXtst -lX11
+	$(GPP) xmacrorec2.cpp -o xmacrorec2 $(LIBS2)
 
 clean:
 	rm xmacrorec xmacroplay xmacrorec2