Commits

seanmcl  committed d62e18a

ocaml_inotify as packed module

  • Participants
  • Parent commits 0f2435f

Comments (0)

Files changed (3)

File ocaml/contrib/ocaml_inotify/Makefile

 
 OCAMLFLAGS = -for-pack Ocaml_inotify
 
-all: ocaml_inotify.cmxa test.inotify
+all: ocaml_inotify.cmxa inotify_test
 
 ocaml_inotify.cmxa: inotify_stubs.o inotify.cmi inotify.cmo inotify.cmx
 	gcc -bundle -flat_namespace -undefined suppress -o dllocaml_inotify_stubs.so inotify_stubs.o
 uninstall:
 	ocamlfind remove $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME)
 
-test.inotify: ocaml_inotify.cmxa test.inotify.ml
+inotify_test: ocaml_inotify.cmxa inotify_test.ml
 	$(OCAMLOPT) -I . -o $@ unix.cmxa $+
 
 clean:

File ocaml/omake/Makefile

         -pp $(PP) \
         -strict-sequence -inline 20 -nodynlink -g \
 	-package core -package core_extended -package async -package pcre \
-	-I $(INOTIFY_DIR) inotify.cmxa
+	-I $(INOTIFY_DIR) ocaml_inotify.cmxa
 
 # Jane-specific CentOS 5 build compatibility based on jane/trunk/OMakeroot:
 REDHAT_RELEASE = $(shell \
 
 FILES=          \
 process         \
+std             \
 omake_inotify   \
-std             \
 util            \
 id		\
 files		\

File ocaml/omake/query.ml

       Deferred.unit
     | Register_emacs pid ->
       Emacs.register pid writer;
-      watch_for_dead_emacs pid
+      watch_for_dead_emacs pid;
+      Deferred.unit
     | Send_to_emacs (pid, msg) ->
       begin
         match pid with