Permalink
Browse files

[weakid] fix weakid install

  • Loading branch information...
samoht committed Nov 9, 2009
1 parent 72f78a4 commit 32f0aded826ea946cb38619e52588a4440618841
Showing with 14 additions and 19 deletions.
  1. +2 −0 weakid/META
  2. +8 −11 weakid/Makefile
  3. +1 −5 weakid/pa_weakid.ml
  4. +3 −3 weakid/test/all.ml
View
@@ -4,4 +4,6 @@ package "syntax" (
description = "Weak ID for OCaml values"
requires = "camlp4, type-conv.syntax, hash.syntax"
archive(syntax, preprocessor) = "pa_weakid.cma"
+ archive(byte) = "hweak.cmo"
+ archive(native) = "hweak.cmx"
)
View
@@ -1,17 +1,12 @@
-OCAMLMAKEFILE = ../OCamlMakefile
-ANNOTATE = yes
-
-SOURCES = p4_weakid.ml pa_weakid.ml hweak.mli hweak.ml
-PACKS = type-conv hash.syntax
-RESULT = pa_weakid
-USE_CAMLP4 = yes
+.DEFAULT: all
.PHONY: all
-all: dcl
- @ :
+all:
+ $(MAKE) -f Makefile.syntax
+ $(MAKE) -f Makefile.core
install: all
- ocamlfind install weakid META pa_weakid.cm{i,a} p4_weakid.cm{i,o} hweak.cm{i,o}
+ ocamlfind install weakid META pa_weakid.cm{i,a} p4_weakid.cm{i,o} hweak.{o,cm{i,o,x}}
uninstall:
ocamlfind remove weakid
@@ -20,4 +15,6 @@ reinstall:
$(MAKE) uninstall
$(MAKE) install
-include $(OCAMLMAKEFILE)
+clean:
+ $(MAKE) -f Makefile.syntax clean
+ $(MAKE) -f Makefile.core clean
View
@@ -27,9 +27,5 @@ let _ =
add_generator "weakid"
(fun tds ->
let _loc = loc_of_ctyp tds in
- <:str_item<
- module Hash = struct
- $P4_weakid.gen tds$
- end
- >>
+ <:str_item< $P4_weakid.gen tds$ >>
)
View
@@ -30,8 +30,8 @@ type o =
open OUnit
-let test_marshall () =
-()
+let test_syntax () = ()
+
let suite = [
- "all_f_marshall" >:: test_marshall
+ "all_f_syntax" >:: test_syntax
]

0 comments on commit 32f0ade

Please sign in to comment.