diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | rpkid/Doxyfile | 2 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 4 | ||||
| -rw-r--r-- | rpkid/rpki/__doc__.py (renamed from rpkid/rpki/__doc__.py.in) | 26 |
5 files changed, 16 insertions, 24 deletions
@@ -4375,10 +4375,6 @@ then fi -# This should go away once its content has migrated from Doxygen into DocBook. -ac_config_files="$ac_config_files rpkid/rpki/__doc__.py" - - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -5115,7 +5111,6 @@ do "rpkid/tests/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/tests/Makefile" ;; "rpkid/portal-gui/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/portal-gui/Makefile" ;; "rtr-origin/Makefile") CONFIG_FILES="$CONFIG_FILES rtr-origin/Makefile" ;; - "rpkid/rpki/__doc__.py") CONFIG_FILES="$CONFIG_FILES rpkid/rpki/__doc__.py" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 22c0f0ab..30835d67 100644 --- a/configure.ac +++ b/configure.ac @@ -382,7 +382,4 @@ then AC_CONFIG_FILES([rtr-origin/Makefile]) fi -# This should go away once its content has migrated from Doxygen into DocBook. -AC_CONFIG_FILES([rpkid/rpki/__doc__.py]) - AC_OUTPUT diff --git a/rpkid/Doxyfile b/rpkid/Doxyfile index 0e42c37f..71b88fd3 100644 --- a/rpkid/Doxyfile +++ b/rpkid/Doxyfile @@ -666,7 +666,7 @@ EXAMPLE_RECURSIVE = NO # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = doc +IMAGE_PATH = $(IMAGE_PATH) # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index f971b3ad..baf99cd2 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -152,7 +152,7 @@ docclean: rm -rf doc/html doc/latex doc/xml html: dot eps png - TZ='' doxygen + TZ='' IMAGE_PATH=${abs_builddir}/doc doxygen tgz: html cd doc && tar -cf - html | gzip -9 >manual.tar.gz @@ -174,7 +174,7 @@ docs: dot eps png html text tgz pdf distclean:: clean docclean cd tests; ${MAKE} $@ - rm -f TAGS rpki/__doc__.py Makefile + rm -f TAGS Makefile all install clean test distclean deinstall uninstall:: @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done diff --git a/rpkid/rpki/__doc__.py.in b/rpkid/rpki/__doc__.py index c46617fc..de79980b 100644 --- a/rpkid/rpki/__doc__.py.in +++ b/rpkid/rpki/__doc__.py @@ -2242,29 +2242,29 @@ ## @page sql-schemas SQL database schemas # # @li @subpage rpkid-sql "rpkid database schema" -# @li @subpage pubd-sql "pubd database schema" +# @li @subpage pubd-sql "pubd database schema" # @li @subpage irdbd-sql "irdbd database schema" ## @page rpkid-sql rpkid SQL schema # -# @image html @abs_top_builddir@/rpkid/doc/rpkid.png "Diagram of rpkid.sql" -# @image latex @abs_top_builddir@/rpkid/doc/rpkid.eps "Diagram of rpkid.sql" height=\textheight +# @image html rpkid.png "Diagram of rpkid.sql" +# @image latex rpkid.eps "Diagram of rpkid.sql" height=\textheight # # @verbinclude rpkid.sql ## @page pubd-sql pubd SQL Schema # -# @image html @abs_top_builddir@/rpkid/doc/pubd.png "Diagram of pubd.sql" -# @image latex @abs_top_builddir@/rpkid/doc/pubd.eps "Diagram of pubd.sql" width=\textwidth +# @image html pubd.png "Diagram of pubd.sql" +# @image latex pubd.eps "Diagram of pubd.sql" width=\textwidth # -# @verbinclude @abs_top_builddir@/rpkid/pubd.sql +# @verbinclude pubd.sql ## @page irdbd-sql irdbd SQL Schema # -# @image html @abs_top_builddir@/rpkid/doc/irdbd.png "Diagram of irdbd.sql" -# @image latex @abs_top_builddir@/rpkid/doc/irdbd.eps "Diagram of irdbd.sql" width=\textwidth +# @image html irdbd.png "Diagram of irdbd.sql" +# @image latex irdbd.eps "Diagram of irdbd.sql" width=\textwidth # -# @verbinclude @abs_top_builddir@/rpkid/irdbd.sql +# @verbinclude irdbd.sql ## @page bpki-model BPKI model # @@ -2314,8 +2314,8 @@ # Here is a simplified picture of what the BPKI might look like for an # rpkid operator that hosts two entities, "Alice" and "Ellen": # -# @image html @abs_top_builddir@/rpkid/doc/rpkid-bpki.png -# @image latex @abs_top_builddir@/rpkid/doc/rpkid-bpki.eps width=\textwidth +# @image html rpkid-bpki.png +# @image latex rpkid-bpki.eps width=\textwidth # # Black objects belong to the hosting entity, blue objects belong to # the hosted entities, red objects are cross-certified objects from @@ -2342,8 +2342,8 @@ # Here's a simplified picture of what the BPKI might look like for a # pubd operator that serves two clients, "Alice" and "Bob": # -# @image html @abs_top_builddir@/rpkid/doc/pubd-bpki.png -# @image latex @abs_top_builddir@/rpkid/doc/pubd-bpki.eps width=\textwidth +# @image html pubd-bpki.png +# @image latex pubd-bpki.eps width=\textwidth # # While it is likely that RIRs (at least) will operate both rpkid and # pubd instances, the two functions are conceptually separate. As far |