gtk-doc/: Include CFLAGS and LDFLAGS in GTKDOC_CFLAGS and GTKDOC_LDFLAGS, otherwise...

Original commit message from CVS:
* gtk-doc-plugins.mak:
* gtk-doc.mak:
Include CFLAGS and LDFLAGS in GTKDOC_CFLAGS and GTKDOC_LDFLAGS,
otherwise the values passed to configure are ignored.
Fixes bug #536978.

diff --git a/ChangeLog b/ChangeLog
index 1da5e72..f508750 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-20  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * gtk-doc-plugins.mak:
+       * gtk-doc.mak:
+       Include CFLAGS and LDFLAGS in GTKDOC_CFLAGS and GTKDOC_LDFLAGS,
+       otherwise the values passed to configure are ignored.
+       Fixes bug #536978.
+
 2008-06-05  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
        * m4/gst-error.m4:

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index 7d9578c..adf41e9 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -117,8 +117,9 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
            done;                                                       \
        else                                                            \
            $(INSPECT_ENVIRONMENT)                                      \
-           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
-           CFLAGS="-g $(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)"               \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
+           CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)"                         \
+           LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)"                         \
            $(GST_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)"   \
                --module=$(DOC_MODULE) --source=$(PACKAGE) &&           \
                $(PYTHON)                                               \

diff --git a/gtk-doc.mak b/gtk-doc.mak
index 011e9c0..458a400 100644 (file)
--- a/gtk-doc.mak
+++ b/gtk-doc.mak
@@ -64,8 +64,9 @@ scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles)
            fi ;                                                        \
            GST_PLUGIN_SYSTEM_PATH=`cd $(top_builddir) && pwd`          \
            GST_PLUGIN_PATH=                                            \
-           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
-           CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)"          \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
+           CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)"                         \
+           LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)"                         \
            gtkdoc-scangobj --type-init-func="gst_init(NULL,NULL)"      \
                --module=$(DOC_MODULE) ;                                \
        else                                                            \