Commit be9096a5 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

gitlab-ci: skip org-mode in mingw builds

* .gitlab-ci.yml: Here.
* doc/Makefile.am: Make sure the svg files are only rebuilt when org
files are processed.
parent cbfbf536
......@@ -117,6 +117,7 @@ mingw-shared:
script:
- autoreconf -vfi
- ./configure CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-posix --host i686-w64-mingw32 --disable-python
- touch doc/org-stamp
- make
artifacts:
when: on_failure
......@@ -135,6 +136,7 @@ mingw-static:
- mkdir install_dir
- autoreconf -vfi
- ./configure CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-posix --host i686-w64-mingw32 --disable-python --disable-shared --enable-optimizations --disable-devel LDFLAGS='-static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -Wl,-lwinpthread -Wl,--no-whole-archive' --prefix=/usr
- touch doc/org-stamp
- make
- make install-exec DESTDIR=$PWD/install_dir
- VERSION=`autoconf --trace='AC_INIT:$2'`
......
......@@ -45,7 +45,7 @@ spot.html spot.tag: stamp
DISTCLEANFILES = spot.tag spot.html stamp
.PHONY: org org-man
org:
org: $(PICTURES_EXTRA)
cd $(top_builddir) && $(MAKE) doc/org/init.el
rm -rf $(srcdir)/userdoc $(builddir)/org/org.errors
$(MAKE) org-man org/plantuml.jar
......@@ -68,7 +68,6 @@ ORG_FILES = \
org/init.el.in \
org/spot.css \
org/arch.tex \
$(srcdir)/org/arch.svg \
org/autcross.org \
org/autfilt.org \
org/csv.org \
......@@ -81,7 +80,6 @@ ORG_FILES = \
org/hoa.org \
org/hierarchy.org \
org/hierarchy.tex \
$(srcdir)/org/hierarchy.svg \
org/index.org \
org/install.org \
org/ioltl.org \
......@@ -115,7 +113,11 @@ ORG_FILES = \
org/upgrade2.org \
org/satmin.org \
org/satmin.tex \
org/setup.org \
org/setup.org
PICTURES_EXTRA = \
$(srcdir)/org/arch.svg \
$(srcdir)/org/hierarchy.svg \
$(srcdir)/org/satmin.svg
$(srcdir)/org/satmin.svg: org/satmin.tex
......@@ -145,6 +147,7 @@ EXTRA_DIST = \
footer.html \
mainpage.dox \
$(ORG_FILES) \
$(PICTURES_EXTRA) \
$(srcdir)/org-stamp \
$(srcdir)/userdoc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment