summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2011-05-31 23:26:52 +0300
committerFelipe Contreras <felipe.contreras@gmail.com>2011-05-31 23:32:01 +0300
commit9d271bad9f615a08817963e5ca5966947b0c2ac0 (patch)
tree64c176d33476a1ad2a0443d1db24a1dc64378d5f
parentf171a38b7ee412147b1e4e3e78211c94e81f948e (diff)
build: fix default config
Apparently gst_structure_from_string() doesn't like the multiple lines in omx_mpeg4dec caps. It's easily fixable by passing the -P option to the preprocessor, which also gets rid of the comments. If this breaks with somebody's pre-processor, speak now :) Reported-by: Sebastian Dröge <slomo@circular-chaos.org> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
-rw-r--r--omx/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/omx/Makefile.am b/omx/Makefile.am
index e8804ee..1c0f059 100644
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -54,7 +54,7 @@ EXTRA_DIST = headers gstomx.conf gstomx_conf.c
# (ie. "foo" "bar" becomes "foobar") so they are handled similar to what the
# C compiler does itself
gstomx.conf: gstomx.conf.in
- cat $^ | $(CPP) $(CFLAGS) $(libgstomx_la_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) - | grep -v "^#" | sed 's/\"\ *\"//g' >> $@
+ cat $^ | $(CPP) -P $(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