Skip to content

Commit 387b498

Browse files
committed
Move doxygen target and related files to toplevel.
Note: this also means the target directory changes from libgnucash/docs/html to [toplevel]/doxygen/html
1 parent c816d2b commit 387b498

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

CMakeLists.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,13 @@ add_definitions (-DHAVE_CONFIG_H)
843843
set (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/common/config.h)
844844
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/common/config.h.cmake.in ${CONFIG_H})
845845

846+
# The doxygen developer documentation
847+
find_program(DOXYGEN doxygen)
848+
if (NOT ${DOXYGEN} STREQUAL "DOXYGEN-NOTFOUND")
849+
configure_file(doxygen.cfg.in doxygen.cfg)
850+
add_custom_target(doc ${DOXYGEN} doxygen.cfg)
851+
endif()
852+
846853
# The subdirectories
847854
add_subdirectory (borrowed)
848855
add_subdirectory (data)
@@ -884,7 +891,10 @@ endif()
884891
set(DIST_FILE "${PACKAGE_PREFIX}.tar")
885892

886893
set(toplvl_DIST_local ${gnucash_DOCS}
887-
CMakeLists.txt README)
894+
doxygen.cfg.in
895+
doxygen_main_page.c
896+
CMakeLists.txt
897+
README)
888898

889899

890900
set_local_dist(toplvl_DIST ${toplvl_DIST_local})

libgnucash/doc/doxygen.cfg.in doxygen.cfg.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ PROJECT_LOGO =
6868
# entered, it will be relative to the location where doxygen was started. If
6969
# left blank the current directory will be used.
7070

71-
OUTPUT_DIRECTORY =
71+
OUTPUT_DIRECTORY = doxygen
7272

7373
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
7474
# sub-directories (in 2 levels) under the output directory of each output format
File renamed without changes.

libgnucash/doc/CMakeLists.txt

-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
set(doc_FILES
22
constderv.html
3-
doxygen.cfg.in
4-
doxygen_main_page.c
53
finderv.html
64
finutil.html
75
README
86
)
97

108
set_local_dist(doc_DIST_local CMakeLists.txt ${doc_FILES})
119
set(doc_DIST ${doc_DIST_local} ${doc_design_DIST} PARENT_SCOPE)
12-
13-
find_program(DOXYGEN doxygen)
14-
if (NOT ${DOXYGEN} STREQUAL "DOXYGEN-NOTFOUND")
15-
configure_file(doxygen.cfg.in doxygen.cfg)
16-
add_custom_target(doc ${DOXYGEN} doxygen.cfg)
17-
endif()

po/POTFILES.in

-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,6 @@ libgnucash/core-utils/gnc-locale-utils.cpp
621621
libgnucash/core-utils/gnc-path.c
622622
libgnucash/core-utils/gnc-prefs.c
623623
libgnucash/core-utils/gnc-version.c
624-
libgnucash/doc/doxygen_main_page.c
625624
libgnucash/engine/Account.cpp
626625
libgnucash/engine/cap-gains.cpp
627626
libgnucash/engine/cashobjects.cpp

0 commit comments

Comments
 (0)