Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3219 in orxonox.OLD


Ignore:
Timestamp:
Dec 19, 2004, 4:31:17 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: checking for doxygen-executable. doxygen will only be made, if doxygen exists on the computer.

Location:
orxonox/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.am

    r3198 r3219  
    1414             doc/doxyconf/project
    1515
    16 ##
    17 ## Doxygen stuff
    18 ##
    19 
     16## doxygen stuff
     17if DOXYGEN
    2018DOXYGEN_INPUT = "src src/gui src/importer"
    2119
    … …  
    2927
    3028include doc/documentation.am
     29endif

  • orxonox/trunk/Makefile.in

    r3218 r3219  
    9292DEFS = @DEFS@
    9393DEPDIR = @DEPDIR@
     94DOXYGEN = @DOXYGEN@
     95DOXYGEN_FALSE = @DOXYGEN_FALSE@
     96DOXYGEN_TRUE = @DOXYGEN_TRUE@
    9497ECHO_C = @ECHO_C@
    9598ECHO_N = @ECHO_N@
    … …  
    178181             doc/doxyconf/project
    179182
    180 DOXYGEN_INPUT = "src src/gui src/importer"
    181 DOXYGEN_EXCLUDE =
    182 DOXYGEN_EXAMPLE_PATH =
    183 DOXYGEN_SEARCHENGINE = YES
    184 DX_CONFIG_FILE = "$(top_srcdir)/orxodox"
    185 DX_CONF_DIR = "$(top_srcdir)/doc/doxyconf"
     183@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
     184@DOXYGEN_TRUE@DOXYGEN_EXCLUDE =
     185@DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH =
     186@DOXYGEN_TRUE@DOXYGEN_SEARCHENGINE = YES
     187@DOXYGEN_TRUE@DX_CONFIG_FILE = "$(top_srcdir)/orxodox"
     188@DOXYGEN_TRUE@DX_CONF_DIR = "$(top_srcdir)/doc/doxyconf"
    186189all: config.h
    187190        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    … …  
    597600
    598601
    599 doc:
    600         if test ! -e $(DX_CONFIG_FILE); then \
    601          make doc-config; \
    602         fi
    603         @echo "Generating doxygen Documentation"; \
    604         doxygen $(DX_CONFIG_FILE)
    605 
    606 doc-config:
    607         @echo "Generationg doxygen configuration File." ; \
    608         if test -e  "$(top_srcdir)/orxodox"; then \
    609           echo "deleting existing Configuration File" ; \
    610           rm $(top_srcdir)/orxodox ; \
    611         fi ; \
    612         touch $(DX_CONFIG_FILE) ; \
    613         $(DX_CONF_DIR)/project                                          >> $(DX_CONFIG_FILE); \
    614         echo "PROJECT_NAME              = \"$(PACKAGE_NAME)\""          >> $(DX_CONFIG_FILE); \
    615         echo "PROJECT_NUMBER            = \"$(PACKAGE_VERSION)\""       >> $(DX_CONFIG_FILE); \
    616         echo "OUTPUT_DIRECTORY          = \"$(top_srcdir)/doc/\""       >> $(DX_CONFIG_FILE); \
    617         echo " " >> $(DX_CONFIG_FILE); \
    618 \
    619         $(DX_CONF_DIR)/build                                            >> $(DX_CONFIG_FILE); \
    620 \
    621         $(DX_CONF_DIR)/progress                                         >> $(DX_CONFIG_FILE); \
    622         if test $(DEBUG) -ge 2 ; then \
    623          echo "QUIET                    = \"NO\""                       >> $(DX_CONFIG_FILE); \
    624         else \
    625          echo "QUIET                    = \"YES\""                      >> $(DX_CONFIG_FILE); \
    626         fi ;\
    627 \
    628         $(DX_CONF_DIR)/input                                            >> $(DX_CONFIG_FILE); \
    629         echo "INPUT                     = $(DOXYGEN_INPUT)"             >> $(DX_CONFIG_FILE); \
    630 \
    631         $(DX_CONF_DIR)/preprocessor                                     >> $(DX_CONFIG_FILE); \
    632         echo "INCLUDE_PATH              = \"$(top_srcdir)\""            >> $(DX_CONFIG_FILE); \
    633         echo "PREDEFINED                = \"HAVE_CONFIG_H= \""          >> $(DX_CONFIG_FILE); \
    634         \
    635         $(DX_CONF_DIR)/confopts                                         >> $(DX_CONFIG_FILE)
    636 
    637 doc-delete:
    638         @echo "Deleting doxygen Documentation"
    639         rm -rf $(top_srcdir)/doc/html
    640         rm -rf $(top_srcdir)/doc/latex
    641 
    642 distclean-local: doc-delete
    643         rm -f $(top_srcdir)/orxodox
    644 
    645 clean-local:  doc-delete
    646 
    647 all-local: doc
    648 
    649 .PHONY: doc doc-config doc-delete
     602@DOXYGEN_TRUE@doc:
     603@DOXYGEN_TRUE@  if test ! -e $(DX_CONFIG_FILE); then \
     604@DOXYGEN_TRUE@   make doc-config; \
     605@DOXYGEN_TRUE@  fi
     606@DOXYGEN_TRUE@  @echo "Generating doxygen Documentation"; \
     607@DOXYGEN_TRUE@  $(DOXYGEN) $(DX_CONFIG_FILE)
     608
     609@DOXYGEN_TRUE@doc-config:
     610@DOXYGEN_TRUE@  @echo "Generationg doxygen configuration File." ; \
     611@DOXYGEN_TRUE@  if test -e  "$(top_srcdir)/orxodox"; then \
     612@DOXYGEN_TRUE@    echo "deleting existing Configuration File" ; \
     613@DOXYGEN_TRUE@    rm $(top_srcdir)/orxodox ; \
     614@DOXYGEN_TRUE@  fi ; \
     615@DOXYGEN_TRUE@  touch $(DX_CONFIG_FILE) ; \
     616@DOXYGEN_TRUE@  $(DX_CONF_DIR)/project                                          >> $(DX_CONFIG_FILE); \
     617@DOXYGEN_TRUE@  echo "PROJECT_NAME              = \"$(PACKAGE_NAME)\""          >> $(DX_CONFIG_FILE); \
     618@DOXYGEN_TRUE@  echo "PROJECT_NUMBER            = \"$(PACKAGE_VERSION)\""       >> $(DX_CONFIG_FILE); \
     619@DOXYGEN_TRUE@  echo "OUTPUT_DIRECTORY          = \"$(top_srcdir)/doc/\""       >> $(DX_CONFIG_FILE); \
     620@DOXYGEN_TRUE@  echo " " >> $(DX_CONFIG_FILE); \
     621@DOXYGEN_TRUE@\
     622@DOXYGEN_TRUE@  $(DX_CONF_DIR)/build                                            >> $(DX_CONFIG_FILE); \
     623@DOXYGEN_TRUE@\
     624@DOXYGEN_TRUE@  $(DX_CONF_DIR)/progress                                         >> $(DX_CONFIG_FILE); \
     625@DOXYGEN_TRUE@  if test $(DEBUG) -ge 2 ; then \
     626@DOXYGEN_TRUE@   echo "QUIET                    = \"NO\""                       >> $(DX_CONFIG_FILE); \
     627@DOXYGEN_TRUE@  else \
     628@DOXYGEN_TRUE@   echo "QUIET                    = \"YES\""                      >> $(DX_CONFIG_FILE); \
     629@DOXYGEN_TRUE@  fi ;\
     630@DOXYGEN_TRUE@\
     631@DOXYGEN_TRUE@  $(DX_CONF_DIR)/input                                            >> $(DX_CONFIG_FILE); \
     632@DOXYGEN_TRUE@  echo "INPUT                     = $(DOXYGEN_INPUT)"             >> $(DX_CONFIG_FILE); \
     633@DOXYGEN_TRUE@\
     634@DOXYGEN_TRUE@  $(DX_CONF_DIR)/preprocessor                                     >> $(DX_CONFIG_FILE); \
     635@DOXYGEN_TRUE@  echo "INCLUDE_PATH              = \"$(top_srcdir)\""            >> $(DX_CONFIG_FILE); \
     636@DOXYGEN_TRUE@  echo "PREDEFINED                = \"HAVE_CONFIG_H= \""          >> $(DX_CONFIG_FILE); \
     637@DOXYGEN_TRUE@  \
     638@DOXYGEN_TRUE@  $(DX_CONF_DIR)/confopts                                         >> $(DX_CONFIG_FILE)
     639
     640@DOXYGEN_TRUE@doc-delete:
     641@DOXYGEN_TRUE@  @echo "Deleting doxygen Documentation"
     642@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/html
     643@DOXYGEN_TRUE@  rm -rf $(top_srcdir)/doc/latex
     644
     645@DOXYGEN_TRUE@distclean-local: doc-delete
     646@DOXYGEN_TRUE@  rm -f $(top_srcdir)/orxodox
     647
     648@DOXYGEN_TRUE@clean-local:  doc-delete
     649
     650@DOXYGEN_TRUE@all-local: doc
     651
     652@DOXYGEN_TRUE@.PHONY: doc doc-config doc-delete
    650653
    651654# Local Variables:

  • orxonox/trunk/configure

    r3218 r3219  
    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 MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_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 DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    38683868
    38693869
    3870 
    38713870## GTK-disabled
    38723871echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
    … …  
    39023901  echo "no"
    39033902fi
     3903
     3904
     3905## PROGRAMM CHECKING
     3906# checking for Doxygen
     3907# Extract the first word of "doxygen", so it can be a program name with args.
     3908set dummy doxygen; ac_word=$2
     3909echo "$as_me:$LINENO: checking for $ac_word" >&5
     3910echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     3911if test "${ac_cv_path_DOXYGEN+set}" = set; then
     3912  echo $ECHO_N "(cached) $ECHO_C" >&6
     3913else
     3914  case $DOXYGEN in
     3915  [\\/]* | ?:[\\/]*)
     3916  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
     3917  ;;
     3918  *)
     3919  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3920for as_dir in $PATH
     3921do
     3922  IFS=$as_save_IFS
     3923  test -z "$as_dir" && as_dir=.
     3924  for ac_exec_ext in '' $ac_executable_extensions; do
     3925  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3926    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
     3927    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     3928    break 2
     3929  fi
     3930done
     3931done
     3932
     3933  ;;
     3934esac
     3935fi
     3936DOXYGEN=$ac_cv_path_DOXYGEN
     3937
     3938if test -n "$DOXYGEN"; then
     3939  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
     3940echo "${ECHO_T}$DOXYGEN" >&6
     3941else
     3942  echo "$as_me:$LINENO: result: no" >&5
     3943echo "${ECHO_T}no" >&6
     3944fi
     3945
     3946
     3947
     3948if test $DOXYGEN; then
     3949  DOXYGEN_TRUE=
     3950  DOXYGEN_FALSE='#'
     3951else
     3952  DOXYGEN_TRUE='#'
     3953  DOXYGEN_FALSE=
     3954fi
     3955
    39043956
    39053957### CHECKING FOR SYSTEM ###
    … …  
    76067658Usually this means the macro was only invoked conditionally." >&5
    76077659echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
     7660Usually this means the macro was only invoked conditionally." >&2;}
     7661   { (exit 1); exit 1; }; }
     7662fi
     7663if test -z "${DOXYGEN_TRUE}" && test -z "${DOXYGEN_FALSE}"; then
     7664  { { echo "$as_me:$LINENO: error: conditional \"DOXYGEN\" was never defined.
     7665Usually this means the macro was only invoked conditionally." >&5
     7666echo "$as_me: error: conditional \"DOXYGEN\" was never defined.
    76087667Usually this means the macro was only invoked conditionally." >&2;}
    76097668   { (exit 1); exit 1; }; }
    … …  
    82098268s,@EGREP@,$EGREP,;t t
    82108269s,@DEBUG@,$DEBUG,;t t
     8270s,@DOXYGEN@,$DOXYGEN,;t t
     8271s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t
     8272s,@DOXYGEN_FALSE@,$DOXYGEN_FALSE,;t t
    82118273s,@MSBITFIELDS@,$MSBITFIELDS,;t t
    82128274s,@GTK2_LIBS@,$GTK2_LIBS,;t t

  • orxonox/trunk/configure.ac

    r3218 r3219  
    4343
    4444AC_SUBST(DEBUG)
    45 
    4645
    4746## GTK-disabled
    … …  
    6968fi
    7069
     70
     71## PROGRAMM CHECKING
     72# checking for Doxygen
     73AC_PATH_PROG(DOXYGEN, doxygen)
     74AM_CONDITIONAL(DOXYGEN, test $DOXYGEN)
     75
    7176### CHECKING FOR SYSTEM ###
    7277

  • orxonox/trunk/doc/documentation.am

    r3218 r3219  
    77        fi
    88        @echo "Generating doxygen Documentation"; \
    9         doxygen $(DX_CONFIG_FILE)
     9        $(DOXYGEN) $(DX_CONFIG_FILE)
    1010
    1111doc-config:

  • orxonox/trunk/src/Makefile.in

    r3198 r3219  
    117117DEFS = @DEFS@
    118118DEPDIR = @DEPDIR@
     119DOXYGEN = @DOXYGEN@
     120DOXYGEN_FALSE = @DOXYGEN_FALSE@
     121DOXYGEN_TRUE = @DOXYGEN_TRUE@
    119122ECHO_C = @ECHO_C@
    120123ECHO_N = @ECHO_N@

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

    r3191 r3219  
    9494DEFS = @DEFS@
    9595DEPDIR = @DEPDIR@
     96DOXYGEN = @DOXYGEN@
     97DOXYGEN_FALSE = @DOXYGEN_FALSE@
     98DOXYGEN_TRUE = @DOXYGEN_TRUE@
    9699ECHO_C = @ECHO_C@
    97100ECHO_N = @ECHO_N@

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

    r3191 r3219  
    101101DEFS = @DEFS@
    102102DEPDIR = @DEPDIR@
     103DOXYGEN = @DOXYGEN@
     104DOXYGEN_FALSE = @DOXYGEN_FALSE@
     105DOXYGEN_TRUE = @DOXYGEN_TRUE@
    103106ECHO_C = @ECHO_C@
    104107ECHO_N = @ECHO_N@

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

    r3201 r3219  
    9595DEFS = @DEFS@
    9696DEPDIR = @DEPDIR@
     97DOXYGEN = @DOXYGEN@
     98DOXYGEN_FALSE = @DOXYGEN_FALSE@
     99DOXYGEN_TRUE = @DOXYGEN_TRUE@
    97100ECHO_C = @ECHO_C@
    98101ECHO_N = @ECHO_N@
Note: See TracChangeset for help on using the changeset viewer.