X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=3b89d8b642408e454311405cc6cc005c17d8c616;hb=978f182e9ce00820c1ce8c721f61ab57afabd160;hp=b9f615525c1218780c6259a5454c4c9f5cf097cc;hpb=7489c542a7b7357a1c2bbc436d1d77c601833d3b;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index b9f6155..3b89d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ OCAMLOPT = ocamlopt -g -cc "$(CXX)"
 SYNT_DEBUG = -ppopt -DDEBUG
 else
 CXX = g++  
-OCAMLOPT = ocamlopt  -nodynlink -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
+OCAMLOPT = ocamlopt  -cc "$(CXX)" -ccopt -O3 -ccopt -std=c++0x -noassert -inline $(INLINE)
 endif
 ifeq ($(PROFILE), true)
 SYNT_PROF = $(SYNT_DEBUG) -ppopt -DPROFILE
@@ -101,20 +101,27 @@ libcamlshredder.a: $(CXXOBJECTS) XMLTree/XMLTree.a
 	@echo [LIB] $@
 	$(HIDE) mkdir -p .libs/
 	$(HIDE) cd .libs/ && ar x ../XMLTree/XMLTree.a
-	$(HIDE) $(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) ./.libs/*.o $(LIBS)
+	$(HIDE) $(OCAMLMKLIB) -o camlshredder -custom $(CXXOBJECTS) .libs/*.o $(LIBS)
 	$(HIDE) rm -rf .libs
 
 clean:
 	@echo [CLEAN]
-	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main .libs
+	$(HIDE) rm -f *~ *.cm* *.[oa] *.so main timeXMLTree testXMLTree myTimeXMLTree
+	$(HIDE) rm -rf .libs
 
 
-timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp
+timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp testXMLTree.cpp
 	mkdir -p .libs/
 	cd .libs/ && ar x ../XMLTree/XMLTree.a
 	$(CXX) -o timeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
 	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
 	$(LIBS) timeXMLTree.cpp
+	$(CXX) -o myTimeXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+	$(LIBS) myTimeXMLTree.cpp
+	$(CXX) -o testXMLTree $(CXXFLAGS) $(CXXINCLUDES) XMLDocShredder.o \
+	SXSIStorageInterface.o StorageInterface.o ./.libs/*.o \
+	$(LIBS) testXMLTree.cpp
 	rm -rf .libs
 
 SXSIStorageInterface.o: SXSIStorageInterface.h SXSIStorageInterface.cpp StorageInterface.h