removed IFEXT macro in Makefile

diff --git a/Makefile b/Makefile
index 251338d327a2fb1a278e48980150fd30c346e23d..648847234e3a13304fecc03d91493d532ac4697b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ ifeq ($(NATIVE), 1)
     OCFLAGS    =
     MKLIB      = ocamlmklib
     MKLIBFLAGS = -custom
-    IFEXT      = cmi
     OBJEXT     = cmx
     LIBEXT     = cmxa
     OLDFLAGS   = -compact -ccopt -dead_strip
@@ -14,7 +13,6 @@ else
     OCFLAGS    =
     MKLIB      = ocamlmklib
     MKLIBFLAGS =
-    IFEXT      = cmi
     OBJEXT     = cmo
     LIBEXT     = cma
     OLDFLAGS   = -dllpath .
@@ -22,6 +20,7 @@ endif
 
 # Target Definitions
 #-------------------------------------------------------------------------------
+BINS = edit
 LIBOBJS = \
     lib/tide.$(OBJEXT) \
     lib/env.$(OBJEXT) \
@@ -29,10 +28,10 @@ LIBOBJS = \
 
 .PHONY: all clean
 
-all: edit
+all: $(BINS)
 
 clean:
-       $(RM) deps.mk tide *.cm* *.o *.a *.so lib/*.cm* lib/*.o
+       $(RM) deps.mk $(BINS) *.cm* *.o *.a *.so lib/*.cm* lib/*.o
 
 # Executable targets
 edit: tide.$(LIBEXT) edit.$(OBJEXT)
@@ -50,7 +49,7 @@ deps.mk:
 %:
        $(OC) $(OLDFLAGS) -o $@ $^ -I . -I lib
 
-%.$(IFEXT): %.mli
+%.cmi: %.mli
        $(OC) $(OCFLAGS) -c -o $@ $< -I . -I lib
 
 %.$(OBJEXT): %.ml

diff --git a/deps.mk b/deps.mk
deleted file mode 100644 (file)
index 049ddd5..0000000
--- a/deps.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-edit.cmo :
-edit.cmx :
-lib/env.cmo :
-lib/env.cmx :
-lib/tide.cmo : lib/tide.cmi
-lib/tide.cmx : lib/tide.cmi
-lib/tide.cmi :

diff --git a/edit.ml b/edit.ml
index e3cac869352d999ed1ae0e120738bc5241cbbcd4..5663a11a21e1e22000fbc2c0774f12600cd17d18 100644 (file)
--- a/edit.ml
+++ b/edit.ml
@@ -2,6 +2,11 @@ open Tide
 
 let () =
   let server = Tide.start_server () in
-  for i = 1 to (Array.length Sys.argv) - 1 do
-    Tide.edit_file server Sys.argv.(i)
+  let nargs = Array.length Sys.argv in
+  for i = 1 to (nargs - 1) do
+    let arg = Sys.argv.(i) in
+    if (String.equal "--" arg) then
+      Tide.start_pty server (Array.sub Sys.argv i (nargs - i))
+    else
+      Tide.edit_file server arg
   done

diff --git a/lib/tide.ml b/lib/tide.ml
index 48182849057a43df5fe4754afc886d97246bdaec..cea3bff8d1ed93d6ec1324ad897b662005c0687a 100644 (file)
--- a/lib/tide.ml
+++ b/lib/tide.ml
@@ -1,5 +1,8 @@
-let start_server () = 42
+let start_server () =
+  42
 
-let edit_file server file = ()
+let start_pty server cmd =
+  ()
 
-let foo = "foo"
+let edit_file server file =
+  ()

diff --git a/lib/tide.mli b/lib/tide.mli
index d3d55542d019167891922988e25c547a34b9c820..51191b8087496cd05a079be5b40c1770dfffec77 100644 (file)
--- a/lib/tide.mli
+++ b/lib/tide.mli
@@ -1,2 +1,3 @@
 val start_server : unit -> int
+val start_pty : int -> string array -> unit
 val edit_file : int -> string -> unit