aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2018-10-12 22:56:17 +0200
committerJay Berkenbilt <ejb@ql.org>2018-10-13 18:18:31 +0200
commitad0fd53fc4caf11ea3dffe0ece63b84e0d792674 (patch)
treefdc858924caa412ab27e8c54c4a6f8ae6a0b3cf0
parentc9d11d70a739fa521c2adaebd0ae5b88e643eb78 (diff)
downloadqpdf-ad0fd53fc4caf11ea3dffe0ece63b84e0d792674.tar.zst
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.
-rw-r--r--README-hardening.md1
-rw-r--r--README-maintainer1
-rw-r--r--README.md13
-rwxr-xr-xappimage/build-appimage1
-rwxr-xr-xmake_dist1
5 files changed, 1 insertions, 16 deletions
diff --git a/README-hardening.md b/README-hardening.md
index 7625b085..b33f8bcb 100644
--- a/README-hardening.md
+++ b/README-hardening.md
@@ -16,7 +16,6 @@ make
In qpdf:
```
-./autogen.sh
/tmp/htcondor-analyzer/create-db
CC=/tmp/htcondor-analyzer/cc CXX=/tmp/htcondor-analyzer/cxx ./configure --disable-shared --disable-werror
# to remove conftest.c
diff --git a/README-maintainer b/README-maintainer
index 2f52aa68..e4e31862 100644
--- a/README-maintainer
+++ b/README-maintainer
@@ -228,7 +228,6 @@ OTHER NOTES
To construct a source distribution from a pristine checkout,
`make_dist` does the following:
-./autogen.sh
./configure --enable-doc-maintenance --enable-werror
make build_manual
make distclean
diff --git a/README.md b/README.md
index 26c4a294..c44b6c95 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,7 @@ Please see the [NOTICE](NOTICE.md) file for information on licenses of embedded
# Building from a pristine checkout
-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).
-
-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
-
-```
-./autogen.sh
-./configure --enable-doc-maintenance
-make
-make install
-```
-
-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.
+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.
# Building from source distribution on UNIX/Linux
diff --git a/appimage/build-appimage b/appimage/build-appimage
index 1358117e..1bda105d 100755
--- a/appimage/build-appimage
+++ b/appimage/build-appimage
@@ -83,7 +83,6 @@ appdir=$here/build/appdir
rm -rf $here/build
# Prepare build of QPDF from sources:
-./autogen.sh
./configure --prefix=/usr --enable-werror \
--enable-show-failed-test-output \
--enable-html-doc --enable-pdf-doc "$CUSTOM_CONFIGURE"
diff --git a/make_dist b/make_dist
index 9084bdb1..e872d408 100755
--- a/make_dist
+++ b/make_dist
@@ -107,7 +107,6 @@ if ($version_error)
die "$whoami: version numbers are not consistent\n";
}
-run("./autogen.sh");
run("./configure --enable-doc-maintenance --enable-werror");
run("make -j8 build_manual");
run("make distclean");