Commit ad0fd53fc4caf11ea3dffe0ece63b84e0d792674

Authored by Jay Berkenbilt
1 parent c9d11d70

Remove needless autogen.sh references/invocations

Since the files autogen.sh creates are now controlled, you only have
to run autogen.sh when you modify the source files, not when you
build from a clean checkout.
README-hardening.md
@@ -16,7 +16,6 @@ make @@ -16,7 +16,6 @@ make
16 In qpdf: 16 In qpdf:
17 17
18 ``` 18 ```
19 -./autogen.sh  
20 /tmp/htcondor-analyzer/create-db 19 /tmp/htcondor-analyzer/create-db
21 CC=/tmp/htcondor-analyzer/cc CXX=/tmp/htcondor-analyzer/cxx ./configure --disable-shared --disable-werror 20 CC=/tmp/htcondor-analyzer/cc CXX=/tmp/htcondor-analyzer/cxx ./configure --disable-shared --disable-werror
22 # to remove conftest.c 21 # to remove conftest.c
README-maintainer
@@ -228,7 +228,6 @@ OTHER NOTES @@ -228,7 +228,6 @@ OTHER NOTES
228 To construct a source distribution from a pristine checkout, 228 To construct a source distribution from a pristine checkout,
229 `make_dist` does the following: 229 `make_dist` does the following:
230 230
231 -./autogen.sh  
232 ./configure --enable-doc-maintenance --enable-werror 231 ./configure --enable-doc-maintenance --enable-werror
233 make build_manual 232 make build_manual
234 make distclean 233 make distclean
README.md
@@ -33,18 +33,7 @@ Please see the [NOTICE](NOTICE.md) file for information on licenses of embedded @@ -33,18 +33,7 @@ Please see the [NOTICE](NOTICE.md) file for information on licenses of embedded
33 33
34 # Building from a pristine checkout 34 # Building from a pristine checkout
35 35
36 -When building qpdf from a pristine checkout from version control, documentation and automatically generated files are not present. You may either generate them or obtain them from a released source package, which includes them automatically generated files. If you want to grab just the automatic files, extract a source distribution in a temporary directory, and run `make CLEAN=1 autofiles.zip`. This will create a file called `autofiles.zip`, which can you can extract in a checkout of the source repository. This will enable you to run `./configure` and build normally. This approach is almost certainly required on Windows because of issues running autoconf. This workaround is also described in [README-windows.md](README-windows.md).  
37 -  
38 -For UNIX and UNIX-like systems, you can build the automatically generated files yourself, but you must have some additional tools installed to build from the source repository. To do this, you should have `autoconf` installed (`automake` is not required). Then run  
39 -  
40 -```  
41 -./autogen.sh  
42 -./configure --enable-doc-maintenance  
43 -make  
44 -make install  
45 -```  
46 -  
47 -If you don't have Apache fop and the docbook stylesheets installed, you won't be able to build documentation. You can omit `--enable-doc-maintenance` and produce working qpdf software that passes its test suite, but `make install` will not install documentation files. Depending on your purposes, this may be fine, or you can grab the docs from a source distribution. 36 +When building qpdf from a pristine checkout from version control, generated documentation files are not present. You may either generate them (by passing `--enable-doc-maintenance` to `./configure` and satisfying the extra build-time dependencies) or obtain them from a released source package, which includes them. If you want to grab just the files that are in the source distribution but not in the repository, extract a source distribution in a temporary directory, and run `make CLEAN=1 distfiles.zip`. This will create a file called `distfiles.zip`, which can you can extract in a checkout of the source repository. This step is optional unless you are running make install and want the html and PDF versions of the documentation to be installed.
48 37
49 # Building from source distribution on UNIX/Linux 38 # Building from source distribution on UNIX/Linux
50 39
appimage/build-appimage
@@ -83,7 +83,6 @@ appdir=$here/build/appdir @@ -83,7 +83,6 @@ appdir=$here/build/appdir
83 rm -rf $here/build 83 rm -rf $here/build
84 84
85 # Prepare build of QPDF from sources: 85 # Prepare build of QPDF from sources:
86 -./autogen.sh  
87 ./configure --prefix=/usr --enable-werror \ 86 ./configure --prefix=/usr --enable-werror \
88 --enable-show-failed-test-output \ 87 --enable-show-failed-test-output \
89 --enable-html-doc --enable-pdf-doc "$CUSTOM_CONFIGURE" 88 --enable-html-doc --enable-pdf-doc "$CUSTOM_CONFIGURE"
make_dist
@@ -107,7 +107,6 @@ if ($version_error) @@ -107,7 +107,6 @@ if ($version_error)
107 die "$whoami: version numbers are not consistent\n"; 107 die "$whoami: version numbers are not consistent\n";
108 } 108 }
109 109
110 -run("./autogen.sh");  
111 run("./configure --enable-doc-maintenance --enable-werror"); 110 run("./configure --enable-doc-maintenance --enable-werror");
112 run("make -j8 build_manual"); 111 run("make -j8 build_manual");
113 run("make distclean"); 112 run("make distclean");