rewrite make rules, use ${MAKE} var instead of make

Makefile

@@ -5,18 +5,18 @@
 # High level rules
 
 all : 
-	cd SAX; make 
+	cd SAX; ${MAKE}
-	cd Utils; make 
+	cd Utils; ${MAKE}
-	cd XML; make 
+	cd XML; ${MAKE}
-	cd examples; make
+	cd examples; ${MAKE}
 
 # Cleaning up
 
 clean :
-	cd SAX; make clean
+	cd SAX; ${MAKE} clean
-	cd Utils; make clean
+	cd Utils; ${MAKE} clean
-	cd XML; make clean
+	cd XML; ${MAKE} clean
-	cd examples; make clean
+	cd examples; ${MAKE} clean
 	rm -f arabica.tar.gz
 	rm -f arabica.zip
 

SAX/Makefile

@@ -6,10 +6,13 @@
 REMOVE = rm -rf
 LINK = ln -sf
 
+# For GNU make:
+OS_VER := $(shell uname -s | sed -e s/\[\.\ \]/_/g)
+# For other make (like Sun's) you can try:
+# OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
 
 # C/C++ shortcuts
-CPP = /usr/local/bin/gcc
+CXX = c++
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -26,39 +29,42 @@ CPP = /usr/local/bin/gcc
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-COMPILE_FLAGS = -Wall -c -shared
+ifeq ($(OS_VER),SunOS)
+CXXFLAGS = -Wall -pthreads -fpic
+else
+CXXFLAGS = -Wall -pthread -fpic
+endif
 
-LINK_FLAGS = -Wall -Werror -shared -Wl,-soname,libSAX.so.1
+LDFLAGS = -shared -Wl,"-hlibSAX.so.1"
+CCDEPFLAGS = -E -M
 
 # Uncomment for optimisations
-#  COMPILE_FLAGS += -02
+CXXFLAGS += -O2
-#  LINK_FLAGS    += -02
+LDFLAGS  += -O2
 
 # Uncomment for debug version
-#  COMPILE_FLAGS += -g -D__DEBUG__
+#  CXXFLAGS += -g -D__DEBUG__
-#  LINK_FLAGS    += -g -D__DEBUG__
 
 
 # Includes and library directories 
-#INCS_DIRS = -I.. -I/usr/local/include/stlport
+INCS_DIRS = -I.. -I/usr/local/include/stlport -I/opt/gnome2/include/libxml2
-INCS_DIRS = -I.. 
+#INCS_DIRS = -I.. 
 
 LIBS_DIRS = 
 
 STATIC_LIBS =
-DYNAMIC_LIBS = 
+DYNAMIC_LIBS = -lstlport_gcc -L/opt/gnome2/lib -lxml2
 
+CXXFLAGS += ${INCS_DIRS}
+LDFLAGS += ${DYNAMIC_LIBS}
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-# Source files
+SRCS =  wrappers/saxexpat.cpp \
-PARSER_OPTS = -DUSE_EXPAT
+	wrappers/saxlibxml2.cpp \
-# define any or all of USE_EXPAT, USE_XERCES, USE_LIBXML2, USE_GARDEN to pull in support
+	helpers/InputSourceResolver.cpp \
-# for those parsers.  
+	../Utils/utf16utf8_codecvt.cpp 
-
-
-SRCS = saxlib.cpp helpers/InputSourceResolver.cpp ../Utils/utf16utf8_codecvt.cpp 
 
 HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
 OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
@@ -69,15 +75,18 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
 
 # High level rules
 
-all : libSAX.a 
+all : libSAX.so.1 libSAX.a 
 
-libSAX.so : $(OBJS)
+libSAX.so.1 : $(OBJS)
-	$(CPP) $(LIB_DIRS) $(LINK_FLAGS) -o $@ $(OBJS)
+	$(LINK.cc) -o $@ $(OBJS)
-	$(LINK) $@ $@.1
+	cp -f libSAX.so.1 ../bin
+	(cd ../bin; rm -f libSAX.so; ln -s libSAX.so.1 libSAX.so)
+
+#	$(LINK) $@ libSAX.so
 
 libSAX.a : $(OBJS)
 	ar r $@ $(OBJS)
-	cp libSAX.a ../bin
+	cp -f libSAX.a ../bin
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -85,14 +94,7 @@ libSAX.a : $(OBJS)
 # Compile rules
 
 %.o : %.cpp
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -o $@ $<
+	$(COMPILE.cc) -o $@ $<
-
-saxlib.cpp : saxlib.tpl ParserConfig.h
-	$(CPP) -x c++ -E $(PARSER_OPTS) saxlib.tpl -o saxlib.cpp
-
-ParserConfig.h: ParserConfig.tpl
-	$(CPP) -x c++ -E $(PARSER_OPTS) ParserConfig.tpl -o ParserConfig.h
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -102,7 +104,7 @@ ParserConfig.h: ParserConfig.tpl
 depend : .depend
 
 .depend ::
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -MM $(SRCS) > .depend
+	$(COMPILE.cc) $(CCDEPFLAGS) $(SRCS) > .depend
 
 -include .depend
 
@@ -113,7 +115,7 @@ depend : .depend
 # Cleaning up
 
 clean :
-	$(REMOVE) .depend *.o helpers/*.o wrappers/*.o ../Utils/*.o libSAX*  *~ helpers/*~ core ../bin/libSAX* saxlib.cpp ParserConfig.h
+	$(REMOVE) .depend *.o helpers/*.o wrappers/*.o ../Utils/*.o libSAX*  *~ helpers/*~ core ../bin/libSAX*
 
 
 

Utils/Makefile

@@ -1,11 +1,18 @@
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
+# Utilities
+
 REMOVE = rm -rf
 LINK = ln -sf
-# C/C++ shortcuts
-CPP = /usr/local/bin/gcc
 
+# For GNU make:
+OS_VER := $(shell uname -s | sed -e s/\[\.\ \]/_/g)
+# For other make (like Sun's) you can try:
+# OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
+
+# C/C++ shortcuts
+CXX = c++
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -22,34 +29,38 @@ CPP = /usr/local/bin/gcc
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-COMPILE_FLAGS = -Wall -c -shared
+ifeq ($(OS_VER),SunOS)
+CXXFLAGS = -Wall -pthreads -fpic
+else
+CXXFLAGS = -Wall -pthread -fpic
+endif
 
-LINK_FLAGS = -Wall -Werror -shared -Wl
+LDFLAGS = -shared -Wl,"-hlibArabicaUtils.so.1"
+CCDEPFLAGS = -E -M
 
 # Uncomment for optimisations
-#  COMPILE_FLAGS += -02
+CXXFLAGS += -O2
-#  LINK_FLAGS    += -02
+LDFLAGS  += -O2
 
 # Uncomment for debug version
-#  COMPILE_FLAGS += -g -D__DEBUG__
+#  CXXFLAGS += -g -D__DEBUG__
-#  LINK_FLAGS    += -g -D__DEBUG__
 
 
 # Includes and library directories 
-#INCS_DIRS = -I.. -I/usr/local/include/stlport
+INCS_DIRS = -I.. -I/usr/local/include/stlport -I/opt/gnome2/include/libxml2
-INCS_DIRS = -I.. 
+#INCS_DIRS = -I.. 
 
 LIBS_DIRS = 
 
 STATIC_LIBS =
-DYNAMIC_LIBS = 
+DYNAMIC_LIBS = -lstlport_gcc -L/opt/gnome2/lib -lxml2
 
+CXXFLAGS += ${INCS_DIRS}
+LDFLAGS += ${DYNAMIC_LIBS}
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-# Source files
-
 SRCS =  utf16utf8_codecvt.cpp iso8859_1utf8_codecvt.cpp
 
 HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
@@ -61,16 +72,16 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
 
 # High level rules
 
-all : libArabicaUtils.a 
+all : libArabicaUtils.so.1 libArabicaUtils.a
 
-libArabicaUtils.so : $(OBJS)
+libArabicaUtils.so.1 : $(OBJS)
-	$(CPP) $(LIB_DIRS) $(LINK_FLAGS) -o $@ $(OBJS)
+	$(LINK.cc) -o $@ $(OBJS)
-	$(LINK) $@ $@.1
+	cp -f libArabicaUtils.so.1 ../bin
+	(cd ../bin; ln -fs libArabicaUtils.so.1 libArabicaUtils.so)
 
 libArabicaUtils.a : $(OBJS)
 	ar r $@ $(OBJS)
-	cp *.a ../bin
+	cp -f libArabicaUtils.a ../bin
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -78,8 +89,7 @@ libArabicaUtils.a : $(OBJS)
 # Compile rules
 
 %.o : %.cpp
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -o $@ $<
+	$(COMPILE.cc) -o $@ $<
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -89,7 +99,7 @@ libArabicaUtils.a : $(OBJS)
 depend : .depend
 
 .depend ::
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -MM $(SRCS) > .depend
+	$(COMPILE.cc) $(CCDEPFLAGS) $(SRCS) > .depend
 
 -include .depend
 

XML/Makefile

@@ -1,11 +1,18 @@
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
+# Utilities
+
 REMOVE = rm -rf
 LINK = ln -sf
-# C/C++ shortcuts
-CPP = /usr/local/bin/gcc
 
+# For GNU make:
+OS_VER := $(shell uname -s | sed -e s/\[\.\ \]/_/g)
+# For other make (like Sun's) you can try:
+# OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
+
+# C/C++ shortcuts
+CXX = c++
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -22,34 +29,38 @@ CPP = /usr/local/bin/gcc
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-COMPILE_FLAGS = -Wall -c -shared
+ifeq ($(OS_VER),SunOS)
+CXXFLAGS = -Wall -pthreads -fpic
+else
+CXXFLAGS = -Wall -pthread -fpic
+endif
 
-LINK_FLAGS = -Wall -Werror -shared -Wl
+LDFLAGS = -shared -Wl,"-hlibArabicaUtils.so.1"
+CCDEPFLAGS = -E -M
 
 # Uncomment for optimisations
-#  COMPILE_FLAGS += -02
+CXXFLAGS += -O2
-#  LINK_FLAGS    += -02
+LDFLAGS  += -O2
 
 # Uncomment for debug version
-#  COMPILE_FLAGS += -g -D__DEBUG__
+#  CXXFLAGS += -g -D__DEBUG__
-#  LINK_FLAGS    += -g -D__DEBUG__
 
 
 # Includes and library directories 
-#INCS_DIRS = -I.. -I/usr/local/include/stlport
+INCS_DIRS = -I.. -I/usr/local/include/stlport -I/opt/gnome2/include/libxml2
-INCS_DIRS = -I.. 
+#INCS_DIRS = -I.. 
 
 LIBS_DIRS = 
 
 STATIC_LIBS =
-DYNAMIC_LIBS = 
+DYNAMIC_LIBS = -lstlport_gcc -L/opt/gnome2/lib -lxml2
 
+CXXFLAGS += ${INCS_DIRS}
+LDFLAGS += ${DYNAMIC_LIBS}
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-# Source files
-
 SRCS =  XMLCharacterClasses.cpp
 
 HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
@@ -61,16 +72,16 @@ OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
 
 # High level rules
 
-all : libArabicaXML.a 
+all : libArabicaXML.so.1 libArabicaXML.a
 
-libArabicaXML.so : $(OBJS)
+libArabicaXML.so.1 : $(OBJS)
-	$(CPP) $(LIB_DIRS) $(LINK_FLAGS) -o $@ $(OBJS)
+	$(LINK.cc) -o $@ $(OBJS)
-	$(LINK) $@ $@.1
+	cp -f libArabicaXML.so.1 ../bin
+	(cd ../bin; ln -fs libArabicaXML.so.1 libArabicaXML.so)
 
 libArabicaXML.a : $(OBJS)
 	ar r $@ $(OBJS)
-	cp *.a ../bin
+	cp -f libArabicaXML.a ../bin
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -78,8 +89,7 @@ libArabicaXML.a : $(OBJS)
 # Compile rules
 
 %.o : %.cpp
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -o $@ $<
+	$(COMPILE.cc) -o $@ $<
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -89,7 +99,7 @@ libArabicaXML.a : $(OBJS)
 depend : .depend
 
 .depend ::
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -MM $(SRCS) > .depend
+	$(COMPILE.cc) $(CCDEPFLAGS) $(SRCS) > .depend
 
 -include .depend
 

examples/Makefile

@@ -5,14 +5,14 @@
 # High level rules
 
 all : 
-	cd SAX; make 
+	cd SAX; ${MAKE}
-	cd SAX2DOM; make 
+	cd SAX2DOM; ${MAKE}
 
 # Cleaning up
 
 clean :
-	cd SAX; make clean
+	cd SAX; ${MAKE} clean
-	cd SAX2DOM; make clean
+	cd SAX2DOM; ${MAKE} clean
 
 
 #/////////////////////////////////////////////////////////////////////////

examples/SAX/Makefile

@@ -6,9 +6,13 @@
 REMOVE = rm -rf
 LINK = ln -sf
 
+# For GNU make:
+OS_VER := $(shell uname -s | sed -e s/\[\.\ \]/_/g)
+# For other make (like Sun's) you can try:
+# OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
 
 # C/C++ shortcuts
-CPP = /usr/local/bin/gcc
+CXX = c++
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -25,36 +29,38 @@ CPP = /usr/local/bin/gcc
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-COMPILE_FLAGS = -Wall -c -g
+ifeq ($(OS_VER),SunOS)
+CXXFLAGS = -Wall -pthreads -fpic
+else
+CXXFLAGS = -Wall -pthread -fpic
+endif
 
-LINK_FLAGS = -Wall 
+LDFLAGS = 
+CCDEPFLAGS = -E -M
 
 # Uncomment for optimisations
-#  COMPILE_FLAGS += -02
+CXXFLAGS += -O2
-#  LINK_FLAGS    += -02
+LDFLAGS  += -O2 -L../../bin -lstlport_gcc -lSAX -lArabicaUtils -lxml2
 
 # Uncomment for debug version
-#  COMPILE_FLAGS += -g -D__DEBUG__
+#  CXXFLAGS += -g -D__DEBUG__
-#  LINK_FLAGS    += -g -D__DEBUG__
 
 
 # Includes and library directories 
-#INCS_DIRS = -I../.. -I../../include -I/usr/local/include/stlport 
+INCS_DIRS = -I../.. -I/usr/local/include/stlport -I/opt/gnome2/include/libxml2
-INCS_DIRS = -I../.. -I../../include
+#INCS_DIRS = -I.. 
 
-#LIBS_DIRS = -L/usr/local/lib -L../../bin 
+LIBS_DIRS = 
-LIBS_DIRS = -L../../bin
 
-#STATIC_LIBS = -lstlport_gcc -lSAX -lexpat  -lstdc++ 
+STATIC_LIBS =
-STATIC_LIBS = -lSAX -lstdc++
+DYNAMIC_LIBS = -L../../bin -L/opt/gnome2/lib -lstlport_gcc -lSAX -lxml2
 
-PARSER_LIBS = -lexpat
+CXXFLAGS += ${INCS_DIRS}
+LDFLAGS += ${DYNAMIC_LIBS}
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-# Source files
-
 PYX_SRCS = pyx.cpp
 PYX_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(PYX_SRCS)))
 PYX_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(PYX_SRCS)))
@@ -67,6 +73,7 @@ WRITER_SRCS = writer.cpp
 WRITER_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(WRITER_SRCS)))
 WRITER_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(WRITER_SRCS)))
 
+
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
@@ -75,15 +82,15 @@ WRITER_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(WRITER_SRCS)))
 all : pyx simple_handler writer
 
 pyx : $(PYX_OBJS)
-	$(CPP) $(PYX_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(PARSER_LIBS) -o pyx 
+	$(LINK.cc) -o $@ $(PYX_OBJS)
 	cp pyx ../../bin
 
 simple_handler : $(SIMPLE_OBJS)
-	$(CPP) $(SIMPLE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(PARSER_LIBS) -o simple_handler 
+	$(LINK.cc) -o $@ $(SIMPLE_OBJS)
 	cp simple_handler ../../bin
 
 writer : $(WRITER_OBJS)
-	$(CPP) $(WRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(PARSER_LIBS) -o writer 
+	$(LINK.cc) -o $@ $(WRITER_OBJS)
 	cp writer ../../bin
 
 #/////////////////////////////////////////////////////////////////////////
@@ -92,8 +99,7 @@ writer : $(WRITER_OBJS)
 # Compile rules
 
 %.o : %.cpp
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -o $@ $<
+	$(COMPILE.cc) -o $@ $<
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -103,7 +109,7 @@ writer : $(WRITER_OBJS)
 depend : .depend
 
 .depend ::
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -MM $(SRCS) > .depend
+	$(COMPILE.cc) $(CCDEPFLAGS) ${PYX_SRCS} $(WRITER_SRCS) ${SIMPLE_SRCS} > .depend
 
 -include .depend
 
@@ -114,7 +120,8 @@ depend : .depend
 # Cleaning up
 
 clean :
-	$(REMOVE) .depend *.o  core pyx writer simple_handler ../../bin/pyx ../../bin/writer ../../bin/simple_handler
+	$(REMOVE) .depend *.o core pyx writer simple_handler ../../bin/pyx ../../bin/writer ../../bin/simple_handler
+
 
 
 #/////////////////////////////////////////////////////////////////////////

examples/SAX2DOM/Makefile

@@ -6,9 +6,13 @@
 REMOVE = rm -rf
 LINK = ln -sf
 
+# For GNU make:
+OS_VER := $(shell uname -s | sed -e s/\[\.\ \]/_/g)
+# For other make (like Sun's) you can try:
+# OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
 
 # C/C++ shortcuts
-CPP = /usr/local/bin/gcc
+CXX = c++
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -25,36 +29,39 @@ CPP = /usr/local/bin/gcc
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-COMPILE_FLAGS = -Wall -c -g
+ifeq ($(OS_VER),SunOS)
+CXXFLAGS = -Wall -pthreads -fpic
+else
+CXXFLAGS = -Wall -pthread -fpic
+endif
 
-LINK_FLAGS = -Wall 
+LDFLAGS = 
+CCDEPFLAGS = -E -M
 
 # Uncomment for optimisations
-#  COMPILE_FLAGS += -02
+CXXFLAGS += -O2
-#  LINK_FLAGS    += -02
+LDFLAGS  += -O2 -L../../bin -lstlport_gcc -lSAX -lArabicaUtils -lxml2
 
 # Uncomment for debug version
-#  COMPILE_FLAGS += -g -D__DEBUG__
+#  CXXFLAGS += -g -D__DEBUG__
-#  LINK_FLAGS    += -g -D__DEBUG__
 
 
 # Includes and library directories 
-#INCS_DIRS = -I../.. -I../../include -I/usr/local/include/stlport 
+INCS_DIRS = -I../.. -I/usr/local/include/stlport -I/opt/gnome2/include/libxml2
-INCS_DIRS = -I../.. -I../../include
+#INCS_DIRS = -I.. 
 
-#LIBS_DIRS = -L/usr/local/lib -L../../bin 
+LIBS_DIRS = 
-LIBS_DIRS = -L../../bin
-
-#STATIC_LIBS = -lstlport_gcc -lSAX -lexpat  -lstdc++ 
-STATIC_LIBS = -lSAX -lexpat -lstdc++
 
+STATIC_LIBS =
+DYNAMIC_LIBS = -L../../bin -L/opt/gnome2/lib -lstlport_gcc -lSAX -lxml2
 
+CXXFLAGS += ${INCS_DIRS}
+LDFLAGS += ${DYNAMIC_LIBS}
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
 
-# Source files
+SAXDOM_SRCS = main.cpp test_Attribute.cpp test_Document.cpp test_DocumentFragment.cpp test_DocumentType.cpp test_DOMImplementation.cpp test_Element.cpp test_ProcessingInstruction.cpp test_Siblings.cpp test_SAX.cpp
-SAXDOM_SRCS = main.cpp test_Attribute.cpp test_Document.cpp test_DocumentFragment.cpp test_DocumentType.cpp test_DOMImplementation.cpp test_Element.cpp test_ProcessingInstruction.cpp test_Siblings.cpp
 SAXDOM_HDRS = $(patsubst %.cpp,%.h,$(SAXDOM_SRCS))
 SAXDOM_OBJS = $(patsubst %.cpp,%.o,$(SAXDOM_SRCS))
 
@@ -71,10 +78,11 @@ CPPUNITUI_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITUI_SRCS))
 
 # High level rules
 
-all : SAX2DOM
+all : sax2dom_test
 
-SAX2DOM : $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
+
-	$(CPP) $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) -o sax2dom_test 
+sax2dom_test : $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
+	$(LINK.cc) -o $@ $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
 	cp sax2dom_test ../../bin
 
 #/////////////////////////////////////////////////////////////////////////
@@ -83,8 +91,7 @@ SAX2DOM : $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
 # Compile rules
 
 %.o : %.cpp
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -o $@ $<
+	$(COMPILE.cc) -o $@ $<
-
 
 #/////////////////////////////////////////////////////////////////////////
 #//////////////////////////////////////////////
@@ -94,7 +101,7 @@ SAX2DOM : $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
 depend : .depend
 
 .depend ::
-	$(CPP) $(COMPILE_FLAGS) $(INCS_DIRS) -MM $(SRCS) > .depend
+	$(COMPILE.cc) $(CCDEPFLAGS) $(SAXDOM_SRCS) $(CPPUNITFW_SRCS) $(CPPUNITUI_SRCS) > .depend
 
 -include .depend
 
@@ -105,7 +112,7 @@ depend : .depend
 # Cleaning up
 
 clean :
-	$(REMOVE) .depend core sax2dom_test ../../bin/sax2dom_test $(SAXDOM_OBJS) $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS)
+	$(REMOVE) .depend *.o core sax2dom_test ../../bin/sax2dom_test
 
 
 #/////////////////////////////////////////////////////////////////////////