Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3558 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Mar 15, 2005, 12:08:27 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: now the documentation only gets build if requested either by the configure skript via: ./configure —enable-ducumentation, or by building in trunk: make doc

Location:
orxonox/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.in

    r3494 r3558  
    9494DEFS = @DEFS@
    9595DEPDIR = @DEPDIR@
     96DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     97DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    9698DOXYGEN = @DOXYGEN@
    9799DOXYGEN_FALSE = @DOXYGEN_FALSE@
    … …  
    658660@DOXYGEN_TRUE@clean-local:  doc-delete
    659661
    660 @DOXYGEN_TRUE@all-local: doc
     662@DOCUMENTATION_TRUE@@DOXYGEN_TRUE@all-local: doc
     663@DOCUMENTATION_FALSE@@DOXYGEN_TRUE@all-local:
    661664
    662665@DOXYGEN_TRUE@.PHONY: doc doc-config doc-delete

  • orxonox/trunk/configure

    r3549 r3558  
    312312#endif"
    313313
    314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
     314ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    868868                          game.
    869869  --enable-sub-projects   also builds the subProjects while make from srcdir
     870  --enable-documentation  also builds the sDocumentation while make from
     871                          srcdir
    870872
    871873Optional Packages:
    … …  
    39753977  echo "no"
    39763978fi
     3979
    39773980#-------------------#
    39783981# SubProject-enable #
    … …  
    40024005fi
    40034006
     4007
     4008#----------------------#
     4009# Documentation-enable #
     4010#----------------------#
     4011def_documentation=no
     4012echo "$as_me:$LINENO: checking if the Documentation should be build by default" >&5
     4013echo $ECHO_N "checking if the Documentation should be build by default... $ECHO_C" >&6
     4014# Check whether --enable-documentation or --disable-documentation was given.
     4015if test "${enable_documentation+set}" = set; then
     4016  enableval="$enable_documentation"
     4017  def_documentation=yes
     4018fi;
     4019if test x$def_documentation = xyes; then
     4020  echo "yes"
     4021fi
     4022if test x$def_documentation = xno; then
     4023  echo "no"
     4024fi
     4025
     4026
     4027if test x$def_documentation = xyes; then
     4028  DOCUMENTATION_TRUE=
     4029  DOCUMENTATION_FALSE='#'
     4030else
     4031  DOCUMENTATION_TRUE='#'
     4032  DOCUMENTATION_FALSE=
     4033fi
    40044034
    40054035#######################
    … …  
    83018331Usually this means the macro was only invoked conditionally." >&5
    83028332echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined.
     8333Usually this means the macro was only invoked conditionally." >&2;}
     8334   { (exit 1); exit 1; }; }
     8335fi
     8336if test -z "${DOCUMENTATION_TRUE}" && test -z "${DOCUMENTATION_FALSE}"; then
     8337  { { echo "$as_me:$LINENO: error: conditional \"DOCUMENTATION\" was never defined.
     8338Usually this means the macro was only invoked conditionally." >&5
     8339echo "$as_me: error: conditional \"DOCUMENTATION\" was never defined.
    83038340Usually this means the macro was only invoked conditionally." >&2;}
    83048341   { (exit 1); exit 1; }; }
    … …  
    89328969s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t
    89338970s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t
     8971s,@DOCUMENTATION_TRUE@,$DOCUMENTATION_TRUE,;t t
     8972s,@DOCUMENTATION_FALSE@,$DOCUMENTATION_FALSE,;t t
    89348973s,@DOXYGEN@,$DOXYGEN,;t t
    89358974s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t

  • orxonox/trunk/configure.ac

    r3549 r3558  
    139139  echo "no"
    140140fi
     141
    141142#-------------------#
    142143# SubProject-enable #
    … …  
    155156AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
    156157
     158#----------------------#
     159# Documentation-enable #
     160#----------------------#
     161def_documentation=no
     162AC_MSG_CHECKING([if the Documentation should be build by default])
     163AC_ARG_ENABLE([documentation],
     164        AC_HELP_STRING( [--enable-documentation],
     165        [also builds the sDocumentation while make from srcdir]), [def_documentation=yes])
     166if test x$def_documentation = xyes; then
     167  echo "yes"
     168fi
     169if test x$def_documentation = xno; then
     170  echo "no"
     171fi
     172AM_CONDITIONAL(DOCUMENTATION, test x$def_documentation = xyes)
    157173#######################
    158174## PROGRAMM CHECKING ##

  • orxonox/trunk/doc/documentation.am

    r3219 r3558  
    5050clean-local:  doc-delete
    5151
     52if DOCUMENTATION
    5253all-local: doc
     54else
     55all-local:
     56endif
    5357
    5458.PHONY: doc doc-config doc-delete

  • orxonox/trunk/src/Makefile.in

    r3555 r3558  
    131131DEFS = @DEFS@
    132132DEPDIR = @DEPDIR@
     133DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     134DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    133135DOXYGEN = @DOXYGEN@
    134136DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/Makefile.in

    r3555 r3558  
    7878DEFS = @DEFS@
    7979DEPDIR = @DEPDIR@
     80DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     81DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    8082DOXYGEN = @DOXYGEN@
    8183DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/graphics/Makefile.in

    r3555 r3558  
    7878DEFS = @DEFS@
    7979DEPDIR = @DEPDIR@
     80DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     81DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    8082DOXYGEN = @DOXYGEN@
    8183DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r3555 r3558  
    9898DEFS = @DEFS@
    9999DEPDIR = @DEPDIR@
     100DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     101DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    100102DOXYGEN = @DOXYGEN@
    101103DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/gui/Makefile.in

    r3555 r3558  
    7878DEFS = @DEFS@
    7979DEPDIR = @DEPDIR@
     80DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     81DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    8082DOXYGEN = @DOXYGEN@
    8183DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/gui/console/Makefile.in

    r3555 r3558  
    9696DEFS = @DEFS@
    9797DEPDIR = @DEPDIR@
     98DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     99DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    98100DOXYGEN = @DOXYGEN@
    99101DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r3555 r3558  
    105105DEFS = @DEFS@
    106106DEPDIR = @DEPDIR@
     107DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     108DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    107109DOXYGEN = @DOXYGEN@
    108110DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/subprojects/Makefile.in

    r3555 r3558  
    7878DEFS = @DEFS@
    7979DEPDIR = @DEPDIR@
     80DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     81DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    8082DOXYGEN = @DOXYGEN@
    8183DOXYGEN_FALSE = @DOXYGEN_FALSE@

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r3555 r3558  
    9393DEFS = @DEFS@
    9494DEPDIR = @DEPDIR@
     95DOCUMENTATION_FALSE = @DOCUMENTATION_FALSE@
     96DOCUMENTATION_TRUE = @DOCUMENTATION_TRUE@
    9597DOXYGEN = @DOXYGEN@
    9698DOXYGEN_FALSE = @DOXYGEN_FALSE@
Note: See TracChangeset for help on using the changeset viewer.