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

diff --git a/ChangeLog b/ChangeLog
index c0f9104..a75aaab 100644 (file)
--- a/ChangeLog
+++ b/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:
@@ -12,18 +23,18 @@
        * docs/gst/gstreamer-docs.sgml:
        * docs/gst/gstreamer-sections.txt:
        * docs/libs/gstreamer-libs-sections.txt:
-          add new API entries to the docs
+         add new API entries to the docs
        * libs/gst/controller/Makefile.am:
        * libs/gst/controller/gstcontroller.c:
        * libs/gst/controller/gstcontroller.h:
        * libs/gst/controller/gstcontrollerprivate.h:
        * libs/gst/controller/gsthelper.c:
        * libs/gst/controller/gstinterpolation.c:
-          move private structs to private header
+         move private structs to private header
        * po/README:
-          gstreamer-0.7 -> gstreamer-0.10
+         gstreamer-0.7 -> gstreamer-0.10
        * tests/check/libs/struct_i386.h:
-          remove private structs
+         remove private structs
 
 2006-01-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 

diff --git a/configure.ac b/configure.ac
index c7d6e97..8198808 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index fc01a30..dacb1b3 100644 (file)
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -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

diff --git a/win32/common/config.h b/win32/common/config.h
index 7d252fc..634d483 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -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

diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index f852323..33632d2 100644 (file)
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -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