diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-07 10:02:00 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-07 10:02:00 +0100 |
| commit | 62544179e29235a047f0b9d03859bdb904c86e34 (patch) | |
| tree | 24333f0d21c1db1362bb6d6fb7b4a6d53018b47e /gst/bayer | |
| parent | 9f738908929388464c950b1e45d427eae69268d6 (diff) | |
| parent | 506f97a97538f1949afb6cb72700c8685c1cb00a (diff) | |
| download | gstreamer-plugins-bad-62544179e29235a047f0b9d03859bdb904c86e34.tar.gz | |
Merge branch 'master' into 0.11
Diffstat (limited to 'gst/bayer')
| -rw-r--r-- | gst/bayer/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am index c980678fb..d67899ecc 100644 --- a/gst/bayer/Makefile.am +++ b/gst/bayer/Makefile.am @@ -28,6 +28,7 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:SOURCES $(libgstbayer_la_SOURCES) \ + $(nodist_libgstbayer_la_SOURCES) \ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstbayer_la_CFLAGS) \ -:LDFLAGS $(libgstbayer_la_LDFLAGS) \ $(libgstbayer_la_LIBADD) \ |