Merge.
This commit is contained in:
commit
91058707cf
|
@ -161,7 +161,7 @@ autobuild-dev:
|
||||||
-make suspicious
|
-make suspicious
|
||||||
|
|
||||||
# for quick rebuilds (HTML only)
|
# for quick rebuilds (HTML only)
|
||||||
autobuild-html:
|
autobuild-dev-html:
|
||||||
make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
|
make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
|
||||||
|
|
||||||
# for stable releases: only build if not in pre-release stage (alpha, beta)
|
# for stable releases: only build if not in pre-release stage (alpha, beta)
|
||||||
|
@ -173,3 +173,9 @@ autobuild-stable:
|
||||||
esac
|
esac
|
||||||
@make autobuild-dev
|
@make autobuild-dev
|
||||||
|
|
||||||
|
autobuild-stable-html:
|
||||||
|
@case $(DISTVERSION) in *[ab]*) \
|
||||||
|
echo "Not building; $(DISTVERSION) is not a release version."; \
|
||||||
|
exit 1;; \
|
||||||
|
esac
|
||||||
|
@make autobuild-dev-html
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
See the file COPYING for copying permission.
|
See the file COPYING for copying permission.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
#ifdef COMPILED_FROM_DSP
|
#ifdef COMPILED_FROM_DSP
|
||||||
#include "winconfig.h"
|
#include "winconfig.h"
|
||||||
#elif defined(MACOS_CLASSIC)
|
#elif defined(MACOS_CLASSIC)
|
||||||
|
@ -16,8 +18,6 @@
|
||||||
#endif
|
#endif
|
||||||
#endif /* ndef COMPILED_FROM_DSP */
|
#endif /* ndef COMPILED_FROM_DSP */
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
#include "expat_external.h"
|
#include "expat_external.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "xmlrole.h"
|
#include "xmlrole.h"
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
See the file COPYING for copying permission.
|
See the file COPYING for copying permission.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
#ifdef COMPILED_FROM_DSP
|
#ifdef COMPILED_FROM_DSP
|
||||||
#include "winconfig.h"
|
#include "winconfig.h"
|
||||||
#elif defined(MACOS_CLASSIC)
|
#elif defined(MACOS_CLASSIC)
|
||||||
|
@ -16,8 +18,6 @@
|
||||||
#endif
|
#endif
|
||||||
#endif /* ndef COMPILED_FROM_DSP */
|
#endif /* ndef COMPILED_FROM_DSP */
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
#include "expat_external.h"
|
#include "expat_external.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "xmltok.h"
|
#include "xmltok.h"
|
||||||
|
|
Loading…
Reference in New Issue