diff --git a/README b/README index ce9c1c694..6d7d5ec4d 100644 --- a/README +++ b/README @@ -12,22 +12,20 @@ COMPILING THE APPLICATIONS/LIBRARIES: * All x86 targets require the Yasm[1] assembler be installed. * All Windows builds require that Cygwin[2] be installed. - * Building the documentation requires PHP[3] and Doxygen[4]. If you do not - have these packages, you must pass --disable-install-docs to the - configure script. - * Downloading the data for the unit tests requires curl[5] and sha1sum. + * Building the documentation requires Doxygen[3]. If you do not + have this package, the install-docs option will be disabled. + * Downloading the data for the unit tests requires curl[4] and sha1sum. sha1sum is provided via the GNU coreutils, installed by default on many *nix platforms, as well as MinGW and Cygwin. If coreutils is not available, a compatible version of sha1sum can be built from - source[6]. These requirements are optional if not running the unit + source[5]. These requirements are optional if not running the unit tests. [1]: http://www.tortall.net/projects/yasm [2]: http://www.cygwin.com - [3]: http://php.net - [4]: http://www.doxygen.org - [5]: http://curl.haxx.se - [6]: http://www.microbrew.org/tools/md5sha1sum/ + [3]: http://www.doxygen.org + [4]: http://curl.haxx.se + [5]: http://www.microbrew.org/tools/md5sha1sum/ 2. Out-of-tree builds Out of tree builds are a supported method of building the application. For diff --git a/configure b/configure index af3de7bb1..bd95056cb 100755 --- a/configure +++ b/configure @@ -189,7 +189,7 @@ fi # install everything except the sources, by default. sources will have # to be enabled when doing dist builds, since that's no longer a common # case. -enabled doxygen && php -v >/dev/null 2>&1 && enable_feature install_docs +enabled doxygen && enable_feature install_docs enable_feature install_bins enable_feature install_libs diff --git a/docs.mk b/docs.mk index 797b46618..889d18251 100644 --- a/docs.mk +++ b/docs.mk @@ -23,12 +23,6 @@ CODEC_DOX := mainpage.dox \ # Other doxy files sourced in Markdown TXT_DOX = $(call enabled,TXT_DOX) -%.dox: %.txt - @echo " [DOXY] $@" - @$(SRC_PATH_BARE)/examples/gen_example_doxy.php \ - $(@:.dox=) "$($@.DESC)" > $@ < $< - - EXAMPLE_PATH += $(SRC_PATH_BARE) #for CHANGELOG, README, etc EXAMPLE_PATH += $(SRC_PATH_BARE)/examples