gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Reworked documentation generation and installation. Details: - Remove configure flag used to disable the automatic generation of the documentation when istalling. - Now 'make html' generates the documentation. - Now 'make install' does not install the documentation, 'make install-html' does that. The latter two changes follow newer automake conventions. - This also fixes the bug that caused the documentation missing from the tarball.
0 2 0
default
2 files changed with 29 insertions and 63 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -26,44 +26,17 @@
26 26
AC_DISABLE_SHARED
27 27
AC_PROG_LIBTOOL
28 28

	
29
AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
30

	
29 31
if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
30 32
  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
31 33
fi
32 34

	
33
AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
34

	
35 35
dnl Checks for libraries.
36 36
LX_CHECK_GLPK
37 37
LX_CHECK_CPLEX
38 38
LX_CHECK_SOPLEX
39 39

	
40
dnl Enable/disable installing the documentation
41
AC_ARG_ENABLE([doc],
42
AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@])
43
AS_HELP_STRING([--disable-doc], [do not build the documentation]),
44
              [], [enable_doc=yes])
45

	
46
AC_MSG_CHECKING([whether to build the documention])
47
case "$enable_doc" in
48
  yes)
49
    DOXYGEN_INTERNAL_DOCS=NO
50
    AC_MSG_RESULT([yes])
51
    ;;
52
  full)
53
    DOXYGEN_INTERNAL_DOCS=YES
54
    AC_MSG_RESULT([full])
55
    ;;
56
  no)
57
    DOXYGEN_INTERNAL_DOCS=NO
58
    AC_MSG_RESULT([no])
59
    ;;
60
  *)
61
    AC_MSG_ERROR([bad value $enable_doc for option --enable-doc])
62
    ;;
63
esac
64
AC_SUBST(DOXYGEN_INTERNAL_DOCS)
65
AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
66

	
67 40
dnl Disable/enable building the demo programs
68 41
AC_ARG_ENABLE([demo],
69 42
AS_HELP_STRING([--enable-demo], [build the demo programs])
... ...
@@ -145,10 +118,6 @@
145 118
echo -n '  '
146 119
echo $prefix.
147 120
echo
148
echo The documentation will be installed in
149
echo -n '  '
150
eval echo ${datadir}/doc/$PACKAGE.
151
echo
152 121
echo '*********************************************************************'
153 122

	
154 123
echo
Ignore white space 6 line context
1
htmldir = $(datadir)/doc/$(PACKAGE)/html
2

	
3 1
EXTRA_DIST += \
4 2
	doc/Makefile \
5
	doc/Doxyfile.in
3
	doc/Doxyfile.in \
4
	doc/coding_style.dox \
5
	doc/dirs.dox \
6
	doc/groups.dox \
7
	doc/license.dox \
8
	doc/mainpage.dox \
9
	doc/namespaces.dox \
10
	doc/html
6 11

	
7
doc:
12
doc/html:
13
	$(MAKE) $(AM_MAKEFLAGS) html
14

	
15
html-local:
8 16
	if test ${doxygen_found} = yes; then \
9 17
	  cd doc; \
10 18
	  doxygen Doxyfile; \
11 19
	  cd ..; \
12
	fi
13

	
14
doc-clean:
15
	if test ${doxygen_found} = yes; then \
16
	  rm -rf doc/html; \
17
	  rm -f doc/doxygen.log; \
18
	  cd doc; \
19
	  doxygen Doxyfile; \
20
	  cd ..; \
20
	else \
21
	  echo; \
22
	  echo "Doxygen not found."; \
23
	  echo; \
24
	  exit 1; \
21 25
	fi
22 26

	
23 27
clean-local:
24 28
	-rm -rf doc/html
25 29
	-rm -f doc/doxygen.log
26 30

	
27
doc/html:
28
	$(MAKE) $(AM_MAKEFLAGS) doc-clean
29

	
30 31
update-external-tags:
31 32
	wget -O doc/libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag && \
32 33
	mv doc/libstdc++.tag.tmp doc/libstdc++.tag || \
33 34
	rm doc/libstdc++.tag.tmp
34 35

	
35
if WANT_DOC
36

	
37
install-data-local: doc/html
36
install-html-local: doc/html
38 37
	@$(NORMAL_INSTALL)
39
	$(mkinstalldirs) $(DESTDIR)$(htmldir)
40
	@dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
38
	$(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
39
	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
41 40
	  f="`echo $$p | sed -e 's|^.*/||'`"; \
42
	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
43
	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
41
	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
42
	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
44 43
	done
45 44

	
46
uninstall-local: doc/html
45
uninstall-local:
47 46
	@$(NORMAL_UNINSTALL)
48
	@dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
47
	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
49 48
	  f="`echo $$p | sed -e 's|^.*/||'`"; \
50
	  echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
51
	  rm -f $(DESTDIR)$(htmldir)/$$f; \
49
	  echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
50
	  rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
52 51
	done
53 52

	
54
endif WANT_DOC
55

	
56
.PHONY: doc doc-clean
53
.PHONY: update-external-tags
0 comments (0 inline)