1. Yaron Minsky
  2. js-elisp

Commits

Peter Szilagyi  committed 5db02e3

cleaning up makefiles / syncing with bitbucket.org/seanmcl/js-elisp

  • Participants
  • Parent commits 92fa7b8
  • Branches default

Comments (0)

Files changed (4)

File Makefile

-OCAMLOPTFLAGS += -g
-
-default : ocaml
-
-ocaml :
-	cd ocaml && $(MAKE)
-
-clean :
-	cd ocaml && $(MAKE) clean
-	cd elisp && $(MAKE) clean
-
-.PHONY : ocaml elisp

File OMakefile

View file
-Subdirs()
+Subdirs ()

File doc/Makefile

-
-files=omake-mode jane-emacs
-texi=$(addsuffix .texi, $(files))
-info=$(addsuffix .info, $(files))
-
-default: $(info) #commit
-
-# omake-server.info: omake-server.texi
-# 	makeinfo $<
-# 	if [ -n "$$(hg st -m $@)" ]; then hg com -m 'rebuilt $@' $@; fi
-
-%.info : %.texi
-	makeinfo $<
-
-commit:
-	if [ -n "$$(hg st -m $(info))" ]; then hg com -m 'rebuilt info docs' $(info); fi
-
-clean :
-	-rm *.info

File ocaml/omake/Makefile

-
-default : omake_server.exe
-
-OCAMLLIBDIR := $(shell ocamlc -where)
-LIB := $(OCAMLLIBDIR)/..
-
-# In the opam context with a system compiler (like one in /janelibs),
-# the syntax extensions don't live in the same place as ocamlc.
-#
-#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'
-CAMLP4OLIBS = $(LIB) $(shell ocamlfind printconf path 2> /dev/null || :)
-CAMLP4OFLAGS = $(CAMLP4OLIBS:%=-I %)
-PP='camlp4o $(CAMLP4OFLAGS) type_conv/pa_type_conv.cma sexplib/pa_sexp_conv.cma fieldslib/pa_fields_conv.cma pa_pipebang/pa_pipebang.cma'
-
-OS=$(shell uname)
-
-INOTIFY_DIR='../contrib/ocaml_inotify'
-
-OCAMLOPT=ocamlfind ocamlopt $(OCAMLOPTFLAGS) -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
-
-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