X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2FMakefile;h=35d2d97a404d18e25350afd35e6e10c4838b030c;hb=6f8293d53fc21742d9d43f94f0e590e1bfcb8ee0;hp=5712644f6d1f35680cadf856ba115d251542bc19;hpb=98ef219555b4c44fd349178bf2b60d9d879d10d4;p=mlt

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 5712644f..35d2d97a 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lpthread -lm
 
@@ -11,14 +11,14 @@ OBJS = factory.o
 
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0)
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0)
 endif
 
 ifdef USE_PIXBUF
 OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0)
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0)
 endif
 
 ifdef USE_EXIF
@@ -34,9 +34,9 @@ endif
 
 ifdef USE_PANGO
 OBJS += producer_pango.o
-OBJS += filter_dynamictext.o
-CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
-LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2)
+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}')
+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2)
 ifeq ($(targetos),Darwin)
 LDFLAGS += -liconv
 endif