diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-06-10 20:13:26 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-06-10 20:13:26 +0000 |
| commit | 599ab946697b1dd053c467619e04456ccb71789b (patch) | |
| tree | e32c87f6e1f89cd8707b932ea973ef541d2979d7 /liboutput/Makefile | |
| parent | b410bee3a45052cdf118a00939fd161279c415a8 (diff) | |
| download | vdr-plugin-image-599ab946697b1dd053c467619e04456ccb71789b.tar.gz vdr-plugin-image-599ab946697b1dd053c467619e04456ccb71789b.tar.bz2 | |
-optimize 'pkg-config' call
Diffstat (limited to 'liboutput/Makefile')
| -rw-r--r-- | liboutput/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/liboutput/Makefile b/liboutput/Makefile index 7300393..0392ce4 100644 --- a/liboutput/Makefile +++ b/liboutput/Makefile @@ -20,17 +20,27 @@ INCLUDES += -I$(VDRDIR)/include -I. ifdef FFMDIR INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil DEFINES += -DFFMDIR +ifndef WITHOUT_SWSCALER + DEFINES += -DHAVE_SWSCALER + INCLUDES += -I$(FFMDIR)/libswscale +endif else - INCLUDES += $(shell $(PKG-CONFIG) --cflags libavcodec) + +ifndef WITHOUT_SWSCALER + DEFINES += -DHAVE_SWSCALER + PKG-INCLUDES += libswscale +endif + + PKG-INCLUDES += libavcodec endif DEFINES += -D_GNU_SOURCE -ifndef WITHOUT_SWSCALER - DEFINES += -DHAVE_SWSCALER - INCLUDES += $(shell $(PKG-CONFIG) --cflags libswscale) +ifdef PKG-INCLUDES +INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES)) endif + ### The object files (add further files here): OBJS = encode.o stillimage.o stillimage-player.o |