X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmetadata%2Fcreate2%2Ftouch%2FMakefile;h=636a804daba51c14f70aba9db3c6cd105ff927c7;hb=89262281b6e83bd2321150f81f1a0583645eb0c8;hp=2d7ef5a8a3e17b63762cd56eea3a38bf6088922f;hpb=a12fefc78e783661fbb638907252d2265c6af9dd;p=helm.git

diff --git a/helm/metadata/create2/touch/Makefile b/helm/metadata/create2/touch/Makefile
index 2d7ef5a8a..636a804da 100644
--- a/helm/metadata/create2/touch/Makefile
+++ b/helm/metadata/create2/touch/Makefile
@@ -1,41 +1,36 @@
-OCAMLOPTIONS = -package netstring -package netclient -package pxp
-
+REQUIRES = helm-getter helm-cic str
+PREDICATES =
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
 OCAMLDEP = ocamldep
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 
+LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+
 all: touch
 opt: touch.opt
 
-DEPOBJS = csc_pxp_reader.ml configuration.ml \
-          clientHTTP.ml clientHTTP.mli cic.ml deannotate.ml \
-          uriManager.ml uriManager.mli getter.ml getter.mli \
-          pxpUriResolver.ml cicParser3.ml cicParser3.mli \
-          cicParser2.ml cicParser2.mli cicParser.ml \
-          cicParser.mli touch.ml
+DEPOBJS = touch.ml
 
-TOUCHOBJS = csc_pxp_reader.cmo configuration.cmo \
-            clientHTTP.cmo cic.cmo deannotate.cmo \
-            uriManager.cmo getter.cmo pxpUriResolver.ml \
-            cicParser3.cmo cicParser2.cmo cicParser.cmo \
-            touch.cmo
+TOUCHOBJS = touch.cmo
 
 depend:
 	$(OCAMLDEP) $(DEPOBJS) > .depend
 
-touch: $(TOUCHOBJS)
+touch: $(TOUCHOBJS) $(LIBRARIES)
 	$(OCAMLC) -linkpkg -o touch $(TOUCHOBJS)
 
-touch.opt: $(TOUCHOBJS:.cmo=.cmx)
+touch.opt: $(TOUCHOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
 	$(OCAMLOPT) -linkpkg -o touch.opt $(TOUCHOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
+.ml.cmo: $(LIBRARIES)
 	$(OCAMLC) -c $<
-.mli.cmi:
+.mli.cmi: $(LIBRARIES)
 	$(OCAMLC) -c $<
-.ml.cmx:
+.ml.cmx: $(LIBRARIES_OPT)
 	$(OCAMLOPT) -c $<
 
 clean: