--- makefile.old	2010-04-07 18:45:30.000000000 +0200
+++ makefile	2012-08-15 22:24:39.322328325 +0200
@@ -93,35 +93,35 @@
 
 $(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc
 
-CFLAGS = -O2
-
 VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin
 
 INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin
 
+LIBS= $(shell pkg-config --libs xerces-c)
+
 $(BINDIR)/%.o:%.cpp
-	$(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@
+	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@
 
 $(BINDIR)/%.o:%.c
 	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
 
 $(BINDIR_XMLIN)/%.o:%.cpp
-	$(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
+	$(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
 
 $(BINDIR_XMLIN)/%.o:%.c
 	$(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
 
 blahtex-linux:  $(BINDIR) $(OBJECTS)  $(HEADERS)
-	$(CXX) $(CFLAGS) -o blahtex $(OBJECTS)
+	$(CXX) $(CXXFLAGS) -o blahtex $(OBJECTS)
 
 blahtex-mac: $(BINDIR) $(OBJECTS)  $(HEADERS)
-	$(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS)
+	$(CXX) $(CXXFLAGS) -o blahtex -liconv $(OBJECTS)
 
 blahtexml-linux:  $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
-	$(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c
+	$(CXX) $(CXXFLAGS) -o blahtexml $(OBJECTS_XMLIN) $(LIBS)
 
 blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
-	$(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c
+	$(CXX) $(CXXFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) $(LIBS)
 
 clean:
 	rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN)