Merge pull request #6 from mcfrisk/coverity

[mlt] / src / modules / gtk2 / Makefile

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index cd172ab17ea7d1c0085ab95515aca4d5fecc069f..acf161c27acd19ec60047325338a0b562a35d1f2 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 include config.mak
 
@@ -5,19 +9,21 @@ TARGET = ../libmltgtk2$(LIBSUF)
 
 OBJS = factory.o
 
-CFLAGS += -I../..
-LDFLAGS += -L../../framework -lmlt -lpthread -lm
-
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
-CFLAGS += `pkg-config gtk+-2.0 --cflags`
-LDFLAGS += `pkg-config gtk+-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gtk+-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gtk+-2.0`
 endif
 
 ifdef USE_PIXBUF
 OBJS += producer_pixbuf.o pixops.o filter_rescale.o
-CFLAGS += `pkg-config gdk-pixbuf-2.0 --cflags`
-LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs`
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0`
+endif
+
+ifdef USE_EXIF
+CFLAGS += $(EXIFCXXFLAGS) 
+LDFLAGS += $(EXIFLIBS)
 endif
 
 ifdef MMX_FLAGS
@@ -28,11 +34,18 @@ endif
 
 ifdef USE_PANGO
 OBJS += producer_pango.o
-CFLAGS += `pkg-config pangoft2 --cflags`
-LDFLAGS += `pkg-config pangoft2 --libs`
+OBJS += filter_dynamictext.o
+CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
+LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
+ifeq ($(targetos),Darwin)
+LDFLAGS += -liconv
+endif
 ifeq ($(targetos),FreeBSD)
 LDFLAGS += -liconv
 endif
+ifeq ($(targetos), MinGW)
+LDFLAGS += -liconv
+endif
 endif
 
 SRCS := $(OBJS:.o=.c)
@@ -59,6 +72,8 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -d "$(DESTDIR)$(datadir)/mlt/gtk2"
+       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/gtk2"
 
 ifneq ($(wildcard .depend),)
 include .depend