mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
docs/manual/Makefile.am: don't do parallel make
Original commit message from CVS: * docs/manual/Makefile.am: don't do parallel make * configure.ac: AC_SUBST HOST_CPU * win32/common/config.h.in: add generations for HOST_CPU and GST_MAJORMINOR * win32/common/config.h: commit generated result
This commit is contained in:
parent
48e21ffd6e
commit
8455a31e67
5 changed files with 28 additions and 5 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2006-01-14 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* docs/manual/Makefile.am:
|
||||
don't do parallel make
|
||||
* configure.ac:
|
||||
AC_SUBST HOST_CPU
|
||||
* win32/common/config.h.in:
|
||||
add generations for HOST_CPU and GST_MAJORMINOR
|
||||
* win32/common/config.h:
|
||||
commit generated result
|
||||
|
||||
2006-01-13 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* docs/manual/appendix-integration.xml:
|
||||
|
|
|
@ -185,6 +185,9 @@ dnl * hardware/architecture *
|
|||
dnl common/m4/gst-arch.m4
|
||||
dnl check CPU type
|
||||
GST_ARCH
|
||||
dnl substitution for win32/common/config.h
|
||||
HOST_CPU=$host_cpu
|
||||
AC_SUBST(HOST_CPU)
|
||||
|
||||
dnl common/m4/gst-arch.m4
|
||||
dnl check for unaligned access
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
### this is the part you can customize if you need to
|
||||
|
||||
# parallel builds don't work, probably due to temporary files
|
||||
MAKEFLAGS = -j1
|
||||
|
||||
# base name of doc
|
||||
DOC = manual
|
||||
# formats defined for upload.mak
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#define GST_MAJORMINOR "0.10"
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "i386"
|
||||
#define HOST_CPU "i686"
|
||||
|
||||
/* Define if the host CPU is an Alpha */
|
||||
#undef HAVE_CPU_ALPHA
|
||||
|
|
|
@ -35,6 +35,12 @@
|
|||
/* Define the version */
|
||||
#define GST_VERSION "@GST_VERSION@"
|
||||
|
||||
/* Define the MAJOR.MINOR version */
|
||||
#define GST_MAJORMINOR "@GST_MAJORMINOR@"
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "@HOST_CPU@"
|
||||
|
||||
/* Define if the host CPU is an Alpha */
|
||||
#undef HAVE_CPU_ALPHA
|
||||
|
||||
|
|
Loading…
Reference in a new issue