Commits

Peter Szilagyi  committed 468b6a6

Moved everything needed for releases into OMakefiles.

  • Participants
  • Parent commits 6ed3976

Comments (0)

Files changed (7)

 OCAMLOPTFLAGS += -g
 
-# CR pszilagyi: The following compatibility settings are necessary but
-# not sufficient to build an ocaml/omake/omake_server.exe (for
-# example) on CentOS 6 that can be run on CentOS 5.  These take care
-# of application libraries, such as libtinfo.so, but not libc.so.
-#
-# When using opam with a recent Jane Street system compiler
-# (/janelibs/ocaml-4.00.0+jane1+with-fp, for example), these are not
-# necessary.  We may want to remove these if we decide to use a
-# /janelibs build as an opam system compiler.
-#
-# 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)
-  OCAMLOPTFLAGS += $(OCAML_LIB_FLAGS)
-endif
-export OCAMLOPTFLAGS
-
-default : ocaml elisp
+default : ocaml
 
 ocaml :
 	cd ocaml && $(MAKE)
 
-elisp :
-	cd elisp && $(MAKE)
-
 clean :
 	cd ocaml && $(MAKE) clean
 	cd elisp && $(MAKE) clean

File bin/install.sh

 # This should be run from a functioning, built checkout, where the
 # developer has already run the following.
 
-#make -C "$dot/"../doc
+#(cd "$dot/".. && omake)
 test -r "$dot/"../doc/jane-emacs.info
 test -r "$dot/"../doc/omake-mode.info
-
-#make -C "$dot/"../elisp/contrib
 test -r "$dot/"../elisp/contrib/tex-site.el
 test .elcs= = .elcs="$(find "$dot/".. -name '*.elc')"
-
-#(cd "$dot/".. && omake)
 test -x "$dot/"../ocaml/omake/omake_server.exe
 test -x "$dot/"ocp-indent
 

File doc/OMakefile

+jane-emacs.info: jane-emacs.texi
+	makeinfo $<
+
+omake-mode.info: omake-mode.texi
+	makeinfo $<
+
+.DEFAULT: jane-emacs.info omake-mode.info

File elisp/Makefile

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

File elisp/OMakefile

+Subdirs()

File elisp/contrib/Makefile

-default : auctex
-
-auctex :
-	ln -sf auctex/tex-site.el .
-	cd auctex && ./configure && $(MAKE)
-	cd auctex && $(MAKE) clean # removes .elc files but not tex-site.el
-
-clean :
-	-cd auctex &&  $(MAKE) clean
-	$(RM) tex-site.el
-
-.PHONY : auctex

File elisp/contrib/OMakefile

+auctex/tex-site.el:
+	cd auctex && \
+	./configure --prefix=/NO-AUCTEX-PREFIX && \
+	make && \
+	make clean	      # removes .elc files but not tex-site.el
+
+# Why does auctex/auctex.el refer to ../tex-site.el?
+tex-site.el: auctex/tex-site.el
+	rm -f tex-site.el
+	cp $< $@
+
+# clean:
+# 	cd auctex && make clean || :
+# 	rm -f tex-site.el
+
+.DEFAULT: tex-site.el