--- build/gcc/Makefile.jj	2010-03-25 14:29:42.091884817 +0700
+++ build/gcc/Makefile	2010-03-25 15:54:55.414620587 +0700
@@ -28,22 +28,20 @@
 bindir = bin
 objdir = obj
 ipath=$(prefix)/bin
-CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions
 JAVAINCS   = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-CXX = g++
 INSTALL=install -o $(USER) -g $(USER)
 
 ##################################################
 
 # define compile options for each build
-CFLAGS   = -DNDEBUG -O3 $(CBASEFLAGS)
-CFLAGSd  = -g $(CBASEFLAGS)
-CFLAGSs  = -DNDEBUG -DASTYLE_LIB -O3 -fpic $(CBASEFLAGS)
-CFLAGSsd = -DASTYLE_LIB -g -fpic $(CBASEFLAGS)
-CFLAGSa  = -DNDEBUG -DASTYLE_LIB -O3 $(CBASEFLAGS)
-CFLAGSad = -DASTYLE_LIB -g $(CBASEFLAGS)
-CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -O3 -fpic $(CBASEFLAGS) $(JAVAINCS)
-CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CBASEFLAGS) $(JAVAINCS)
+CFLAGSnd = -DNDEBUG $(CFLAGS)
+CFLAGSd  = -g $(CFLAGS)
+CFLAGSs  = -DNDEBUG -DASTYLE_LIB -fpic $(CFLAGSnd)
+CFLAGSsd = -DASTYLE_LIB -g -fpic $(CFLAGSd)
+CFLAGSa  = -DNDEBUG -DASTYLE_LIB $(CFLAGSnd)
+CFLAGSad = -DASTYLE_LIB -g $(CFLAGSd)
+CFLAGSsj  = -DNDEBUG -DASTYLE_JNI -fpic $(CFLAGSnd) $(JAVAINCS)
+CFLAGSsjd = -DASTYLE_JNI -g -fpic $(CFLAGSd) $(JAVAINCS)
 
 # object files are built from the source list $(SRC)
 # a suffix is added for each build
@@ -61,7 +59,7 @@
 # OBJ
 $(objdir)/%.o:  %.cpp  astyle.h  astyle_main.h
 	@ mkdir -p $(objdir)
-	$(CXX) $(CFLAGS) -c -o $@ $<
+	$(CXX) $(CFLAGSnd) -c -o $@ $<
 
 # OBJd
 $(objdir)/%_d.o:  %.cpp  astyle.h  astyle_main.h
@@ -104,25 +102,25 @@
 release:  astyle
 astyle:  $(OBJ)
 	@ mkdir -p $(bindir)
-	$(CXX) -s -o $(bindir)/$@ $^
+	$(CXX) $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 debug:  astyled
 astyled:  $(OBJd)
 	@ mkdir -p $(bindir)
-	$(CXX) -o $(bindir)/$@ $^
+	$(CXX) $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 shared:  libastyle.so
 libastyle.so:  $(OBJs)
 	@ mkdir -p $(bindir)
-	$(CXX) -shared -s -o $(bindir)/$@ $^
+	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 shareddebug:  libastyled.so
 libastyled.so:  $(OBJsd)
 	@ mkdir -p $(bindir)
-	$(CXX) -shared -o $(bindir)/$@ $^
+	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 static:  libastyle.a
@@ -140,13 +138,13 @@
 java:  libastylej.so
 libastylej.so:  $(OBJsj)
 	@ mkdir -p $(bindir)
-	$(CXX) -shared -s -o $(bindir)/$@ $^
+	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 javadebug:  libastylejd.so
 libastylejd.so:  $(OBJsjd)
 	@ mkdir -p $(bindir)
-	$(CXX) -shared -o $(bindir)/$@ $^
+	$(CXX) -shared $(LDFLAGS) -o $(bindir)/$@ $^
 	@ echo
 
 all:  release debug shared shareddebug static staticdebug
@@ -158,7 +156,7 @@
 
 cleanobj:
 	rm -f $(objdir)/*.o
-	
+
 install:
 	$(INSTALL) -m 755 -d $(ipath)
 	@$(INSTALL) -m 755 $(bindir)/astyle  $(ipath)