summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac57
3 files changed, 41 insertions, 27 deletions
diff --git a/AUTHORS b/AUTHORS
index c62499790..401f5c3c9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,7 +7,7 @@ dj2 (Dan Sinclair) <dj2@everburning.com>
7Tilman Sauerbeck <tilman@code-monkey.de> 7Tilman Sauerbeck <tilman@code-monkey.de>
8Aleksej Struk <astruk@gmail.com> 8Aleksej Struk <astruk@gmail.com>
9Brian Mattern <rephorm@rephorm.com> 9Brian Mattern <rephorm@rephorm.com>
10devilhorns (Christopher Michael) <devilhorns@devilhorns.us> 10devilhorns (Christopher Michael) <devilhorns@comcast.net>
11/dev/urandom (Viktor Kojouharov) <vkojouharov@gmail.com> 11/dev/urandom (Viktor Kojouharov) <vkojouharov@gmail.com>
12ilLogict (Chidambar Zinnoury) <illogict@online.fr> 12ilLogict (Chidambar Zinnoury) <illogict@online.fr>
13Stafford Horne <shorne@softhome.net> 13Stafford Horne <shorne@softhome.net>
diff --git a/Makefile.am b/Makefile.am
index 8df5af8f0..c1c2b8e53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
4 config.h.in config.sub configure install-sh \ 4 config.h.in config.sub configure install-sh \
5 ltconfig ltmain.sh missing mkinstalldirs \ 5 ltconfig ltmain.sh missing mkinstalldirs \
6 stamp-h.in acconfig.h \ 6 stamp-h.in acconfig.h \
7 enlightenment.spec enlightenment.pc 7 enlightenment.spec enlightenment.pc \
8 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2
8 9
9EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \ 10EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \
10 enlightenment.spec.in enlightenment.spec enlightenment.pc 11 enlightenment.spec.in enlightenment.spec enlightenment.pc
@@ -16,3 +17,9 @@ ACLOCAL_AMFLAGS = -I m4
16 17
17pkgconfigdir = $(libdir)/pkgconfig 18pkgconfigdir = $(libdir)/pkgconfig
18pkgconfig_DATA = enlightenment.pc 19pkgconfig_DATA = enlightenment.pc
20
21.PHONY: doc
22
23doc:
24 @echo "entering doc/"
25 make -C doc doc
diff --git a/configure.ac b/configure.ac
index 1e03fdb3e..edc1e4eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,6 +234,10 @@ if test "[${e_cv_enable_files}]" = yes; then
234fi 234fi
235AC_MSG_RESULT([$e_cv_enable_files]) 235AC_MSG_RESULT([$e_cv_enable_files])
236 236
237# doxygen program for documentation building
238
239EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
240
237# explicit libs for each binary to reduce linkage requirements 241# explicit libs for each binary to reduce linkage requirements
238PKG_CHECK_MODULES(E_REMOTE, [ 242PKG_CHECK_MODULES(E_REMOTE, [
239 ecore 243 ecore
@@ -690,6 +694,7 @@ data/etc/Makefile
690data/icons/Makefile 694data/icons/Makefile
691data/backgrounds/Makefile 695data/backgrounds/Makefile
692doc/Makefile 696doc/Makefile
697doc/e.dox
693config/Makefile 698config/Makefile
694config/default/Makefile 699config/default/Makefile
695config/standard/Makefile 700config/standard/Makefile
@@ -706,40 +711,42 @@ txt_strip() {
706 echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g' 711 echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'
707} 712}
708 713
709MODS="" 714echo
710for mod in $OPTIONAL_MODULES; do
711 MODS="$MODS ${COLOR_HGREEN}+$mod${COLOR_END}"
712done
713MODS=$(txt_strip $MODS)
714
715UNUSED_MODS=""
716for mod in $UNUSED_OPTIONAL_MODULES; do
717 UNUSED_MODS="$UNUSED_MODS ${COLOR_HRED}-$mod${COLOR_END}"
718done
719UNUSED_MODS=$(txt_strip $UNUSED_MODS)
720
721cat << SUMMARY_EOF 715cat << SUMMARY_EOF
722
723Summary: 716Summary:
724 * project.........: $PACKAGE $VERSION 717 * project.........: $PACKAGE $VERSION
725 * prefix..........: $(txt_strip $prefix) 718 * prefix..........: $(txt_strip $prefix)
726 * CFLAGS..........: $(txt_strip $CFLAGS) 719 * CFLAGS..........: $(txt_strip $CFLAGS)
727 * LDFLAGS.........: $(txt_strip $LDFLAGS) 720 * LDFLAGS.........: $(txt_strip $LDFLAGS)
728
729SUMMARY_EOF 721SUMMARY_EOF
722echo
730 723
731if test "x$MODS" != "x"; then 724UNUSED_MODS=""
732 echo -e " * enabled modules.: $MODS" 725for mod in $UNUSED_OPTIONAL_MODULES; do
733fi 726 UNUSED_MODS="$UNUSED_MODS${COLOR_HRED}$mod${COLOR_END} "
727done
734 728
735if test "x$UNUSED_MODS" != "x"; then 729cat << MODULES_EOF
736 echo -e " * disabled modules: $UNUSED_MODS" 730Modules:
731 * disabled........: $(txt_strip $UNUSED_MODS)
732MODULES_EOF
733echo
734
735cat << DOCS_EOF
736Documentation:
737 * enabled.........: ${build_doc}
738DOCS_EOF
739if test "x${build_doc}" = "xyes" ; then
740 echo " Building..........: make doc"
737fi 741fi
742echo
738 743
739cat << HINT_EOF 744cat << COMPILE_EOF
740 745Compilation........: make (or gmake)
741now type: 746COMPILE_EOF
742 747echo
743 make all install
744 748
745HINT_EOF 749cat << INSTALL_EOF
750Installation.......: make all install (as root if needed, with 'su' or 'sudo')
751INSTALL_EOF
752echo