diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-08-24 16:49:04 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-08-30 21:46:44 +0200 |
| commit | e53becc70fad1a30f385457ce8d1975d2f5f1781 (patch) | |
| tree | 10e00a7f97648fa322ba04b7bce42211bfb4aeec /doc/examples | |
| parent | 6fc892d271912e8ca0b0512e224575b192f5addf (diff) | |
| download | ffmpeg-e53becc70fad1a30f385457ce8d1975d2f5f1781.tar.gz | |
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.
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 20dd5e146a..287dfc47a2 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 \ |