Commits

seanmcl committed 790ac04

removed Makefiles

  • Participants
  • Parent commits bd5df8b

Comments (0)

Files changed (8)

Makefile

-
-default : ocaml
-
-ocaml :
-	cd ocaml; $(MAKE)
-
-clean :
-	cd ocaml; $(MAKE) clean
-
-.PHONY : ocaml
 
 default: $(info) #commit
 
-# omake-server.info: omake-server.texi
-# 	makeinfo $<
-# 	if [ -n "$$(hg st -m $@)" ]; then hg com -m 'rebuilt $@' $@; fi
-
 %.info : %.texi
 	makeinfo $<
 

doc/jane-emacs.info

-This is jane-emacs.info, produced by makeinfo version 4.13 from
+This is jane-emacs.info, produced by makeinfo version 4.8 from
 jane-emacs.texi.
 
 INFO-DIR-SECTION Jane Street
    Microfeatures are enabled by calling a function in your .emacs file.
 The two examples above are enabled using
 
+
 (Jane.grep)
 (Jane.perl)
 
 
 
 Tag Table:
-Node: Top180
-Node: Micro-features459
+Node: Top179
+Node: Micro-features458
 Node: Ocamlspotter4517
 
 End Tag Table

doc/omake-mode.info

Binary file modified.

ocaml/Makefile

-
-default : contrib omake
-
-contrib :
-	cd contrib; $(MAKE)
-
-omake :
-	cd omake; $(MAKE)
-
-clean :
-	cd contrib; $(MAKE) clean
-	cd omake; $(MAKE) clean
-
-.PHONY : contrib omake

ocaml/contrib/Makefile

-
-default : 
-	cd ocaml_inotify; $(MAKE)
-
-clean :
-	cd ocaml_inotify; $(MAKE) clean
-

ocaml/contrib/ocaml_inotify/Makefile

-
-OCAMLC = ocamlc
-OCAMLOPT = ocamlopt
-
-OS=$(shell uname)
-
-ifeq ($(OS), Darwin)
-  CC_OPTS=-bundle -flat_namespace -undefined suppress
-else
-  CC_OPTS=-shared
-endif
-
-# inotify.cmxa: inotify_stubs.o inotify.cmx inotify.cmo
-#	ocamlmklib -o inotify inotify_stubs.o inotify.cmx inotify.cmo
-#	ocamlopt -pack -o ocaml_inotify.cmxa unix.cmxa inotify_stubs.o inotify.cmx
-
-# inotify.cma: inotify_stubs.o inotify.cmo
-#	ocamlc -pack -o $@ inotify.cmo inotify_stubs.o
-#	ocamlc -pack -o $@ inotify.cmo inotify_stubs.o
-#	ar rc libinotify.a inotify_stubs.o
-
-# inotify.cma: inotify_stubs.o inotify.cmi inotify.cmx inotify.cmo
-# 	ocamlmklib -v -o inotify unix.cma inotify_stubs.o inotify.cmx inotify.cmo
-
-# inotify.cmxa: inotify_stubs.o inotify.cmi inotify.cmo inotify.cmx
-# 	gcc -bundle -flat_namespace -undefined suppress -o dllinotify.so inotify_stubs.o
-# 	ar cq libinotify.a inotify_stubs.o
-# 	ranlib libinotify.a
-# 	ocamlc -a -o inotify.cma unix.cma inotify.cmo -dllib -linotify -cclib -linotify
-# 	ocamlopt -a -o inotify.cmxa inotify.cmx -cclib -linotify
-
-OCAMLFLAGS = -for-pack Ocaml_inotify
-
-all: ocaml_inotify.cmxa inotify_test
-
-ocaml_inotify.cmxa: inotify_stubs.o inotify.cmi inotify.cmo inotify.cmx
-	gcc $(CC_OPTS) -o dllocaml_inotify_stubs.so inotify_stubs.o
-	ar cq libocaml_inotify_stubs.a inotify_stubs.o
-	ranlib libocaml_inotify_stubs.a
-	ocamlopt -pack -o ocaml_inotify.cmx inotify.cmx
-	ocamlopt -a -o ocaml_inotify.cmxa ocaml_inotify.cmx -cclib -locaml_inotify_stubs
-	ocamlc -pack -o ocaml_inotify.cmo inotify.cmo
-	ocamlc -a -o ocaml_inotify.cma unix.cma ocaml_inotify.cmo -dllib -locaml_inotify_stubs -cclib -locaml_inotify_stubs
-
-%.cmo: %.ml
-	$(OCAMLC) $(OCAMLFLAGS) -c -o $@ $<
-
-%.cmi: %.mli
-	$(OCAMLC) $(OCAMLFLAGS) -c -o $@ $<
-
-%.cmx: %.ml
-	$(OCAMLOPT) $(OCAMLFLAGS) -c -o $@ $<
-
-%.o: %.c
-	$(OCAMLC) -c -o $@ $<
-
-OCAMLFIND_INSTALL_FLAGS ?= -destdir $(OCAMLDESTDIR) -ldconf ignore
-OCAMLLIBDIR := $(shell ocamlc -where)
-OCAMLDESTDIR ?= $(OCAMLLIBDIR)
-PKG_NAME = ocaml_inotify
-
-.PHONY: install
-
-install: $(LIBS)
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma ocaml_inotify.cmxa *.a *.so *.cmx
-
-install-byte:
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma *.a *.so
-
-install-opt:
-	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME) META ocaml_inotify.cmi inotify.mli ocaml_inotify.cma ocaml_inotify.cmxa *.a *.so *.cmx
-
-uninstall:
-	ocamlfind remove $(OCAMLFIND_INSTALL_FLAGS) $(PKG_NAME)
-
-ocaml_inotify_test: ocaml_inotify.cmxa ocaml_inotify_test.ml
-	$(OCAMLOPT) -I . -o $@ unix.cmxa $+
-
-clean:
-	-rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa $(LIBS) $(PROGRAMS)

ocaml/omake/Makefile

-
-default : omake_server.exe
-
-OCAMLLIBDIR := $(shell ocamlc -where)
-LIB := $(OCAMLLIBDIR)/..
-
-PP='camlp4o $(LIB)/type_conv/pa_type_conv.cma $(LIB)/sexplib/pa_sexp_conv.cma $(LIB)/fieldslib/pa_fields_conv.cma $(LIB)/pa_pipebang/pa_pipebang.cma'
-
-OS=$(shell uname)
-
-INOTIFY_DIR='../contrib/ocaml_inotify'
-
-OCAMLOPT=ocamlfind ocamlopt -thread -w @a-4-7-9-29-28 \
-        -pp $(PP) \
-        -strict-sequence -inline 20 -nodynlink -g \
-	-package core -package core_extended -package async -package pcre \
-	-I $(INOTIFY_DIR) ocaml_inotify.cmxa
-
-# Jane-specific CentOS 5 build compatibility based on jane/trunk/OMakeroot:
-REDHAT_RELEASE = $(shell \
-  test -f /etc/redhat-release \
-   && cat /etc/redhat-release)
-REDHAT_VERSION = $(strip \
-  $(if $(findstring CentOS release 5,$(REDHAT_RELEASE)),5,\
-  $(if $(findstring CentOS release 6,$(REDHAT_RELEASE)),6)))
-C5COMPATROOT = /usr/jane
-C5_COMPAT_ROOT_DIRS = \
-  $(C5COMPATROOT)/lib64 \
-  $(C5COMPATROOT)/usr/lib64 \
-  $(C5COMPATROOT)/usr/lib64/mysql
-OCAML_LIB_FLAGS = $(foreach d,$(C5_COMPAT_ROOT_DIRS),\
-  -ccopt -Xlinker \
-  -ccopt -rpath \
-  -ccopt -Xlinker \
-  -ccopt $(d))
-ifeq ($(REDHAT_VERSION),6)
-  OCAMLOPT += $(OCAML_LIB_FLAGS)
-endif
-
-FILES=          \
-process         \
-std             \
-omake_inotify   \
-util            \
-id		\
-files		\
-log		\
-config		\
-server_config   \
-elisp		\
-regex		\
-error		\
-omake		\
-version		\
-emacs		\
-env		\
-omake_command	\
-project		\
-projects	\
-query		\
-server		\
-top             \
-omake_server    \
-
-OCAMLDEP=ocamldep -native -pp $(PP)
-
-ML=$(foreach file, $(FILES), $(file).ml)
-MLI=$(foreach file, $(subst std,,$(FILES)), $(file).mli)
-CMI=$(foreach file, $(FILES), $(file).cmi)
-CMX=$(foreach file, $(FILES), $(file).cmx)
-
-%.cmi : %.mli
-	$(OCAMLOPT) -c $<
-
-%.cmx : %.ml %.mli
-	$(OCAMLOPT) -c $<
-
-%.cmx : %.ml
-	$(OCAMLOPT) -c $<
-
-omake_server.exe : $(CMX)
-	$(OCAMLOPT) -linkpkg -o $@ $(CMX)
-
-# Check whether the files compile without warnings or errors
-
-check-files = omake-lib.el omake.el
-check : *.el
-	emacs -batch -q --no-site-file -f batch-byte-compile $(check-files)
-
-clean :
-	rm -f *.exe *.cmx *.cmi *.spit *.spot *.o *.annot *.omc *.elc .deps
-
-.deps :
-	$(OCAMLDEP) *.ml *.mli > $@
-
-include .deps