diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-06-03 12:09:17 +0200 |
|---|---|---|
| committer | Felipe Contreras <felipe.contreras@nokia.com> | 2011-07-15 15:05:00 +0300 |
| commit | 263d14c995f12f4616245d7c1dc0aae52daba63d (patch) | |
| tree | 4218d874cc24a4a44c3e782f9a0ce2f54424980a | |
| parent | be25bede12b3cbaafcbd0e9e4e054cd19758c58e (diff) | |
build: manually #define EXPERIMENTAL if required
Including config.h does not work as expected and the EXPERIMENTAL define
is not taken into account when generating gstomx.conf otherwise.
Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
| -rw-r--r-- | omx/Makefile.am | 7 | ||||
| -rw-r--r-- | omx/gstomx.conf.in | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/omx/Makefile.am b/omx/Makefile.am index 6d99db7..a105601 100644 --- a/omx/Makefile.am +++ b/omx/Makefile.am @@ -53,8 +53,13 @@ EXTRA_DIST = headers gstomx.conf gstomx_conf.c # Run the C-preprocessor plus some sed voodoo to clean up adjacent strings # (ie. "foo" "bar" becomes "foobar") so they are handled similar to what the # C compiler does itself +if EXPERIMENTAL +GSTOMX_CONF_cppflags = -DEXPERIMENTAL +else +GSTOMX_CONF_cppflags = +endif gstomx.conf: gstomx.conf.in - cat $^ | $(CPP) -P $(DEFS) $(CFLAGS) $(libgstomx_la_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) - | sed 's/\"\ *\"//g' > $@ + cat $^ | $(CPP) -P $(DEFS) $(GSTOMX_CONF_cppflags) $(CFLAGS) $(libgstomx_la_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) - | sed 's/\"\ *\"//g' > $@ # more sed magic to convert the pre-processed config file into a C file # containing one big string. This is linked in and used as the default diff --git a/omx/gstomx.conf.in b/omx/gstomx.conf.in index ff6c86f..69f073b 100644 --- a/omx/gstomx.conf.in +++ b/omx/gstomx.conf.in @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - /* in case of multiple OMX components mapping to a single gst-openmax element * class, a dynamic subclass can be created by specifying the gst-openmax * type as the 'parent-type' and specifying a new unique type name as the @@ -282,7 +278,6 @@ omx_filereadersrc, component-name=OMX.st.audio_filereader, src="ANY", rank=0; - #endif /* EXPERIMENTAL */ omx_volume, |