--- files/astyle-1.22-Makefile.patch.orig	2010-07-28 12:06:54.000000000 +0000
+++ files/astyle-1.22-Makefile.patch	2010-07-28 12:06:09.000000000 +0000
@@ -12,14 +12,14 @@
 -CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS)
 -CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS)
 -CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS)
-+CFLAGSb   = -DNDEBUG $(CFLAGS)
-+CFLAGSd  = -g $(CFLAGS)
-+CFLAGSs  = -DNDEBUG -DASTYLE_LIB -fPIC $(CFLAGS)
-+CFLAGSsd = -DASTYLE_LIB -g -fPIC $(CFLAGS)
-+CFLAGSa  = -DNDEBUG -DASTYLE_LIB $(CFLAGS)
-+CFLAGSad = -DASTYLE_LIB -g $(CFLAGS)
-+CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -fPIC $(CFLAGS) $(JAVAINCS)
-+CFLAGSsjd = -DASTYLE_JNI -g -fPIC $(CFLAGS) $(JAVAINCS)
++CFLAGSb   = -DNDEBUG $(CXXFLAGS)
++CFLAGSd  = -g $(CXXFLAGS)
++CFLAGSs  = -DNDEBUG -DASTYLE_LIB -fPIC $(CXXFLAGS)
++CFLAGSsd = -DASTYLE_LIB -g -fPIC $(CXXFLAGS)
++CFLAGSa  = -DNDEBUG -DASTYLE_LIB $(CXXFLAGS)
++CFLAGSad = -DASTYLE_LIB -g $(CXXFLAGS)
++CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -fPIC $(CXXFLAGS) $(JAVAINCS)
++CFLAGSsjd = -DASTYLE_JNI -g -fPIC $(CXXFLAGS) $(JAVAINCS)
  
  # object files are built from the source list $(SRC)
  # a suffix is added for each build
@@ -37,7 +37,7 @@
  astyle:  $(OBJ)
  	@ mkdir -p $(bindir)
 -	$(CXX) -s -o $(bindir)/$@ $^
-+	$(CXX) -o $(bindir)/$@ $^
++	$(CXX) $(LDFLAGS) -o $(bindir)/$@ $^
  	@ echo
  
  debug:  astyled
@@ -46,7 +46,7 @@
  libastyle.so:  $(OBJs)
  	@ mkdir -p $(bindir)
 -	$(CXX) -shared -Wl,-soname,$@  -s -o $(bindir)/$@ $^
-+	$(CXX) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
++	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
  	@ echo
  
  shareddebug:  libastyled.so
@@ -57,7 +57,7 @@
  libastylej.so:  $(OBJsj)
  	@ mkdir -p $(bindir)
 -	$(CXX) -shared -Wl,-soname,$@  -s -o $(bindir)/$@ $^
-+	$(CXX) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
++	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$@  -o $(bindir)/$@ $^
  	@ echo
  
  javadebug:  libastylejd.so