Commits

james woodyatt committed fc9c9dc

Update the Conjury library. Fixes the problem where the .cma and .cmxa
files aren't installed in the findlib package.

Comments (0)

Files changed (2)

Conjury/lang/C.om

     
     ### Compose (FIX ME: should be in base class)
     protected.compose(cmp)=
-        private.outputs=
+        outputs=
         export outputs
-        foreach(cfg, $(this.CONFIGURATIONS))
+        foreach(cfg, $(CONFIGURATIONS))
             this=$(this.configure $(cfg))
             outputs+=$(this.compose-visit-config $(cmp), $(cfg))
         return $(outputs)

Conjury/lang/OCaml.om

     
     ### Configuration visitor
     protected.visit-configurations(c)=
-        private.outputs=
+        outputs=
         export outputs
-        foreach(config, $(this.CONFIGURATIONS))
+        foreach(config, $(CONFIGURATIONS))
             this.OCAMLC=$(configure-compiler $(this.OCAMLC), $c, $(config))
             this.OCAMLOPT=$(configure-compiler $(this.OCAMLOPT), $c, $(config))
             dst=$(dir $(c.STAGE.DIR)/$(config))
         cmi=$(file $(addprefix $(cdir)/, $(cmi)))
         cmx=$(module-file-by-extension .cmx, $(this.MODULES))
         cmx=$(file $(addprefix $(cdir)/, $(cmx)))
-        libs=
+        libs=$(this.NAME).cma $(this.NAME).cmxa
         export libs
         if $(this.CFILES)
             libs+=dll$(this.NAME).so lib$(this.NAME).a
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.