Markus Mottl avatar Markus Mottl committed 8a7a9fa

Some more cleanups

Comments (0)

Files changed (4)

 DIR = $(shell oasis query name)-$(shell oasis query version)
 TARBALL = $(DIR).tar.gz
 
-DISTFILES = AUTHORS.txt COPYRIGHT.txt INSTALL.txt INSTALL.win32 \
-  LICENSE.txt README.txt Changelog API.odocl \
+DISTFILES = API.odocl AUTHORS.txt Changelog COPYRIGHT.txt \
+  INSTALL.txt INSTALL.win32 LICENSE.txt README.txt \
   Makefile make_prec_dep.ml myocamlbuild.ml _oasis setup.ml _tags \
-  $(wildcard lib/*) $(wildcard examples/*) \
-  OCamlMakefile OMakefile
+  $(wildcard lib/*) $(wildcard examples/*)
 
 .PHONY: configure all byte native doc upload-doc install uninstall reinstall
 all byte native: setup.data
 
 distclean: setup.ml
 	ocaml setup.ml -distclean
-	$(RM) $(wildcard *.ba[0-9] *.bak *~ *.odocl)
+	$(RM) $(wildcard *.ba[0-9] *.bak *~ *.odocl)
     CCOpt: -O2 -DPIC -DEXTERNAL_EXP10 -framework vecLib
 # For development only
 #    CCOpt: -O2 -DPIC -DEXTERNAL_EXP10 -framework vecLib -DPIC -Wall -Werror -Wno-unused -Wno-long-long
-    CCLib: -L/sw/lib -framework vecLib
+    CCLib: -framework vecLib
   # FIXME: mingw is untested!!!
   if system(mingw)
     CCOpt: -O2 -DPIC -DEXTERNAL_EXP10
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 676236ceeecafeb9cb1b7a2ddb00132c) *)
+(* DO NOT EDIT (digest: 2419723db047dad5e965259c3fd21cb1) *)
 module OASISGettext = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISGettext.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISGettext.ml"
   
   let ns_ str = 
     str
 end
 
 module OASISExpr = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISExpr.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISExpr.ml"
   
   
   
 
 
 module BaseEnvLight = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseEnvLight.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseEnvLight.ml"
   
   module MapString = Map.Make(String)
   
 
 
 module MyOCamlbuildFindlib = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
   
   (** OCamlbuild extension, copied from 
     * http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
 end
 
 module MyOCamlbuildBase = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
   
   (** Base functions for writing myocamlbuild.ml
       @author Sylvain Le Gall
   type name = string 
   type tag = string 
   
-# 55 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+# 55 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
   
   type t =
       {
                (OASISExpr.ETest ("system", "linux"),
                  S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]);
                (OASISExpr.ETest ("system", "macosx"),
-                 S
-                   [
-                      A "-cclib";
-                      A "-L/sw/lib";
-                      A "-cclib";
-                      A "-framework";
-                      A "-cclib";
-                      A "vecLib"
-                   ])
+                 S [A "-cclib"; A "-framework"; A "-cclib"; A "vecLib"])
             ]);
           (["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"],
             [
                (OASISExpr.ETest ("system", "linux"),
                  S [A "-lblas"; A "-llapack"]);
                (OASISExpr.ETest ("system", "macosx"),
-                 S [A "-L/sw/lib"; A "-framework"; A "vecLib"])
+                 S [A "-framework"; A "vecLib"])
             ])
        ];
      }
 (* setup.ml generated for the first time by OASIS v0.2.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 538ee741dd97c70de7617789327d5efc) *)
+(* DO NOT EDIT (digest: 5b893cdfc832feb67ca099f55d2eb2e5) *)
 (*
    Regenerated by OASIS v0.2.0
    Visit http://oasis.forge.ocamlcore.org for more information and
    documentation about functions used in this file.
 *)
 module OASISGettext = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISGettext.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISGettext.ml"
   
   let ns_ str = 
     str
 end
 
 module OASISContext = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISContext.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISContext.ml"
   
   open OASISGettext 
   
 end
 
 module OASISUtils = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISUtils.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISUtils.ml"
   
   module MapString = Map.Make(String)
   
 end
 
 module PropList = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/PropList.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/PropList.ml"
   
   open OASISGettext
   
     let clear t =
       Hashtbl.clear t
   
-# 59 "/tmp/buildd/oasis-0.2.0/src/oasis/PropList.ml"
+# 59 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/PropList.ml"
   end
   
   module Schema = 
 end
 
 module OASISMessage = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISMessage.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISMessage.ml"
   
   
   open OASISGettext
 end
 
 module OASISVersion = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISVersion.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISVersion.ml"
   
   open OASISGettext
   
 end
 
 module OASISLicense = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISLicense.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISLicense.ml"
   
   (** License for _oasis fields
       @author Sylvain Le Gall
 end
 
 module OASISExpr = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISExpr.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISExpr.ml"
   
   
   
 end
 
 module OASISTypes = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISTypes.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISTypes.ml"
   
   
   
   
   type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
   
-# 102 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISTypes.ml"
+# 102 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISTypes.ml"
   
   type 'a conditional = 'a OASISExpr.choices 
   
 end
 
 module OASISUnixPath = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISUnixPath.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISUnixPath.ml"
   
   type unix_filename = string
   type unix_dirname = string
 end
 
 module OASISSection = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISSection.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISSection.ml"
   
   (** Manipulate section 
       @author Sylvain Le Gall
 end
 
 module OASISBuildSection = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISBuildSection.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISBuildSection.ml"
   
 end
 
 module OASISExecutable = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISExecutable.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISExecutable.ml"
   
   open OASISTypes
   
 end
 
 module OASISLibrary = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISLibrary.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISLibrary.ml"
   
   open OASISTypes
   open OASISUtils
 end
 
 module OASISFlag = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISFlag.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISFlag.ml"
   
 end
 
 module OASISPackage = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISPackage.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISPackage.ml"
   
 end
 
 module OASISSourceRepository = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISSourceRepository.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISSourceRepository.ml"
   
 end
 
 module OASISTest = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISTest.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISTest.ml"
   
 end
 
 module OASISDocument = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/oasis/OASISDocument.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/oasis/OASISDocument.ml"
   
 end
 
 
 module BaseEnvLight = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseEnvLight.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseEnvLight.ml"
   
   module MapString = Map.Make(String)
   
 
 
 module BaseContext = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseContext.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseContext.ml"
   
   open OASISContext 
   
 end
 
 module BaseMessage = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseMessage.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseMessage.ml"
   
   (** Message to user, overrid for Base 
       @author Sylvain Le Gall
 end
 
 module BaseFilePath = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseFilePath.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseFilePath.ml"
   
   
   open Filename
 end
 
 module BaseEnv = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseEnv.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseEnv.ml"
   
   open OASISTypes
   open OASISGettext
 end
 
 module BaseExec = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseExec.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseExec.ml"
   
   open OASISGettext
   open OASISUtils
 end
 
 module BaseFileUtil = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseFileUtil.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseFileUtil.ml"
   
   open OASISGettext
   
 end
 
 module BaseArgExt = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseArgExt.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseArgExt.ml"
   
   open OASISUtils
   open OASISGettext
 end
 
 module BaseCheck = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseCheck.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseCheck.ml"
   
   open BaseEnv
   open BaseMessage
 end
 
 module BaseOCamlcConfig = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseOCamlcConfig.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseOCamlcConfig.ml"
   
   
   open BaseEnv
 end
 
 module BaseStandardVar = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseStandardVar.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseStandardVar.ml"
   
   
   open OASISGettext
 end
 
 module BaseFileAB = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseFileAB.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseFileAB.ml"
   
   open BaseEnv
   open OASISGettext
 end
 
 module BaseLog = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseLog.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseLog.ml"
   
   open OASISUtils
   
 end
 
 module BaseBuilt = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseBuilt.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseBuilt.ml"
   
   open OASISTypes
   open OASISGettext
 end
 
 module BaseCustom = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseCustom.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseCustom.ml"
   
   open BaseEnv
   open BaseMessage
 end
 
 module BaseDynVar = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseDynVar.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseDynVar.ml"
   
   
   open OASISTypes
 end
 
 module BaseTest = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseTest.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseTest.ml"
   
   open BaseEnv
   open BaseMessage
 end
 
 module BaseDoc = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseDoc.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseDoc.ml"
   
   open BaseEnv
   open BaseMessage
 end
 
 module BaseSetup = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseSetup.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseSetup.ml"
   
   open BaseEnv
   open BaseMessage
 end
 
 module BaseDev = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/base/BaseDev.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/base/BaseDev.ml"
   
   
   
 
 
 module InternalConfigurePlugin = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/internal/InternalConfigurePlugin.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/internal/InternalConfigurePlugin.ml"
   
   (** Configure using internal scheme
       @author Sylvain Le Gall
 end
 
 module InternalInstallPlugin = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/internal/InternalInstallPlugin.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/internal/InternalInstallPlugin.ml"
   
   (** Install using internal scheme
       @author Sylvain Le Gall
 
 
 module OCamlbuildCommon = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
   
   (** Functions common to OCamlbuild build and doc plugin
     *)
 end
 
 module OCamlbuildPlugin = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
   
   (** Build using ocamlbuild  
       @author Sylvain Le Gall
 end
 
 module OCamlbuildDocPlugin = struct
-# 21 "/tmp/buildd/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
+# 21 "/Users/mmottl/local/godi312/build/apps/apps-oasis/work/oasis-0.2.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
   
   (* Create documentation using ocamlbuild .odocl files
      @author Sylvain Le Gall
                            (OASISExpr.ETest ("system", "linux"),
                              ["-lblas"; "-llapack"]);
                            (OASISExpr.ETest ("system", "macosx"),
-                             ["-L/sw/lib"; "-framework"; "vecLib"])
+                             ["-framework"; "vecLib"])
                         ];
                       bs_dlllib = [(OASISExpr.EBool true, [])];
                       bs_dllpath = [(OASISExpr.EBool true, [])];
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.