Skip to content

Commit 0803c5d

Browse files
Remove autotools.
Remove autotools completely. Modify autotols related cmake files. Update README.
1 parent 34481d0 commit 0803c5d

28 files changed

+2
-1391
lines changed

CMakeLists.txt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ else()
5353
endif()
5454
option (WITH_MOBI "Enable build rules for Mobipocket document format" OFF)
5555

56-
# If AUTOTOOLS_IN_DIST is OFF, then 'dist' wont run autogen.sh, and 'distcheck'
57-
# won't run the autotools distcheck. Note that various Makefile.am files are still
58-
# included in the dist when this is OFF. I'll fix that at some point.
59-
option (AUTOTOOLS_IN_DIST "Add autotools support to distribution tarballs." ON)
6056
# ############################################################
6157
# Following parameters can equally be set using -D switches on the CMake command line.
6258
# Set font dirs and font for Russian pdf documents
@@ -185,21 +181,6 @@ endif()
185181
add_subdirectory (guide)
186182
add_subdirectory (help)
187183

188-
if(AUTOTOOLS_IN_DIST)
189-
set(autotoolsfiles
190-
configure.ac
191-
Makefile.am
192-
gnucash-docs.spec.in
193-
chm.make
194-
epub.make
195-
mobi.make
196-
omf.make
197-
pdf.make
198-
xmldocs.make)
199-
200-
add_to_dist(${autotoolsfiles})
201-
endif()
202-
203184
file(GLOB_RECURSE extrafiles
204185
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
205186
cmake/* fonts/* stylesheet/* xsl/* docbook/*)
@@ -231,7 +212,6 @@ add_custom_command(OUTPUT ${DIST_FILE}.gz ${DIST_FILE}.bz2
231212
-D GNUCASH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
232213
-D BUILD_SOURCE_DIR=${CMAKE_BINARY_DIR}
233214
"-Ddist_files=\"${dist_files}\""
234-
-D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
235215
-D SHELL=${SHELL}
236216
-P ${CMAKE_SOURCE_DIR}/cmake/MakeDist.cmake
237217

@@ -246,7 +226,6 @@ add_custom_target(distcheck DEPENDS dist
246226
-D CMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake
247227
-D PACKAGE_PREFIX=${PACKAGE_PREFIX}
248228
-D GNUCASH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
249-
-D AUTOTOOLS_IN_DIST=${AUTOTOOLS_IN_DIST}
250229
-D SHELL=${SHELL}
251230
-P ${CMAKE_SOURCE_DIR}/cmake/MakeDistCheck.cmake
252231
)

Makefile.am

Lines changed: 0 additions & 83 deletions
This file was deleted.

README

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Requirements
2121
* cmake with
2222
** ninja or
2323
** make
24-
or
25-
* autotools (deprecated)
2624

2725
* libxml2
2826
* libxslt [Debian packed the required xsltproc in a separate package,
@@ -105,17 +103,6 @@ For cmake the commands are
105103
# or, if you need mobi
106104
cmake -DWITH_MOBI=ON [options…]
107105

108-
For the deprecated autotools system the commands are:
109-
cd gnucash-docs
110-
./autogen.sh
111-
mkdir build && cd build
112-
# If you don't need mobi
113-
../configure
114-
# or, if you need mobi
115-
../configure --with-mobi
116-
117-
=> This will tell you if you are missing some required tools.
118-
119106
To generate the documentation in html format, run
120107

121108
make html
@@ -159,28 +146,6 @@ For example:
159146
will generate the html version of the help document in all supported
160147
languages.
161148

162-
- Autotools (deprecated)
163-
Go into the directory for that subset and run the above make commands
164-
from there. For example to only generate the English concepts guide:
165-
166-
cd guide/C
167-
make html
168-
169-
or
170-
171-
cd guide/C
172-
make pdf
173-
174-
or
175-
176-
cd guide/C
177-
make epub
178-
179-
or
180-
181-
cd guide/C
182-
make mobi
183-
184149
depending on the output format you require.
185150

186151
* running xmllint

autogen.sh

Lines changed: 0 additions & 63 deletions
This file was deleted.

chm.make

Lines changed: 0 additions & 49 deletions
This file was deleted.

cmake/AddGncDocTargets.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ function (add_gnc_doc_targets docname entities)
3838
add_mobi_target(${docname} ${lang})
3939
endif()
4040

41-
if(AUTOTOOLS_IN_DIST)
42-
set(autotoolsfiles
43-
Makefile.am
44-
${docname}-${lang}.omf)
45-
endif()
46-
4741
file(GLOB_RECURSE figures_dist
4842
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
4943
figures/*.png figures/*.svg)
@@ -52,7 +46,6 @@ function (add_gnc_doc_targets docname entities)
5246
CMakeLists.txt
5347
${docname}.xml
5448
${entities}
55-
${autotoolsfiles}
5649
${figures_dist})
5750

5851
endfunction()

0 commit comments

Comments
 (0)