[FFmpeg-cvslog] examples/Makefile: give priority to pkg-config flags

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Aug 24 16:49:04 2012 +0200| [e53becc70fad1a30f385457ce8d1975d2f5f1781] | committer: Stefano Sabatini

examples/Makefile: give priority to pkg-config flags

In case CFLAGS/LDLIBS are already defined and conflicting with the
pkg-config flags, give priority to the latter since they are used to
detect compilation flags.

This should fix for example the case where there are many different
instances of a library, CFLAGS=-I/foo/include and pkg-config cflags say
-I/bar/include.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e53becc70fad1a30f385457ce8d1975d2f5f1781
---

 doc/examples/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 20dd5e1..287dfc4 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -8,8 +8,8 @@ FFMPEG_LIBS=    libavdevice                        \
                 libavutil                          \
 
 CFLAGS += -Wall -O2 -g
-CFLAGS += $(shell pkg-config --cflags $(FFMPEG_LIBS))
-LDLIBS += $(shell pkg-config --libs $(FFMPEG_LIBS))
+CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
+LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
 
 EXAMPLES=       decoding_encoding                  \
                 filtering_video                    \