X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=b4461a096b6fc19bc50111b03e9b360ee4f7dce7;hb=b8aa8e7f1036cf00d0fadc75ccbe0264bae6c1b2;hp=024552f4235ac84809756456e1beef260524cd64;hpb=92455238a637876bec18bfdaed4f5342f4cbbd1f;p=SXSI%2Fxpathcomp.git

diff --git a/Makefile b/Makefile
index 024552f..b4461a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-INLINE=10
+INLINE=1000
 DEBUG=false
 PROFILE=true
 VERBOSE=false
 
-BASESRC=custom.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
-BASEMLI=sigs.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
+BASESRC=custom.ml memoizer.ml hcons.ml hlist.ml ptset.ml finiteCofinite.ml tag.ml tagSet.ml options.ml tree.ml ata.ml
+BASEMLI=sigs.mli memoizer.mli hcons.mli hlist.mli ptset.mli finiteCofinite.mli tag.mli tagSet.mli options.mli tree.mli  ata.mli
 MLSRCS = memory.ml $(BASESRC)   ulexer.ml  xPath.ml main.ml
 MLISRCS = memory.mli $(BASEMLI)  ulexer.mli xPath.mli
 BASEOBJS= $(BASESRC:.ml=.cmx)
@@ -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 
+	$(HIDE) rm -rf .libs
 
 
-timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp
+timeXMLTree: $(CXXOBJECTS) XMLTree/XMLTree.a  timeXMLTree.cpp myTimeXMLTree.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