examples/Makefile: give priority to pkg-config flags
authorStefano Sabatini <stefasab@gmail.com>
Fri, 24 Aug 2012 14:49:04 +0000 (16:49 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Thu, 30 Aug 2012 19:46:44 +0000 (21:46 +0200)
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.

doc/examples/Makefile

index 20dd5e1..287dfc4 100644 (file)
@@ -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                    \