Apply ldflags-order part of ldflags_order patch from Alberto Villa.

[melted] / src / modules / gtk2 / Makefile

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index c0ec6de..de5fa2f 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -1,30 +1,43 @@
 include ../../../config.mak
+include config.mak
 
-TARGET = ../libmltgtk2.so
+TARGET = ../libmltgtk2$(LIBSUF)
 
-OBJS = factory.o \
-          consumer_gtk2.o \
-          producer_pixbuf.o \
-          producer_pango.o \
-          pixops.o \
-          filter_rescale.o
+OBJS = factory.o
 
-ifdef ($(MMX_FLAGS))
-ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o
+CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
+
+ifdef USE_GTK2
+OBJS += consumer_gtk2.o
+CFLAGS += `pkg-config gtk+-2.0 --cflags`
+LDFLAGS += `pkg-config gtk+-2.0 --libs`
 endif
 
-CFLAGS += `pkg-config gtk+-2.0 --cflags` `pkg-config gdk-pixbuf-2.0 --cflags` `pkg-config pangoft2 --cflags` -I../..
+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`
+endif
 
-LDFLAGS += `pkg-config gtk+-2.0 --libs` `pkg-config gdk-pixbuf-2.0 --libs` `pkg-config pangoft2 --libs`
+ifdef MMX_FLAGS
+ifndef ARCH_X86_64
+ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o
+endif
+endif
 
-LDFLAGS+=-L../../framework -lmlt
+ifdef USE_PANGO
+OBJS += producer_pango.o
+CFLAGS += `pkg-config pangoft2 --cflags`
+LDFLAGS += `pkg-config pangoft2 --libs`
+endif
 
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(ASM_OBJS)
-               $(CC) -shared -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS)
+               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS)
 
 have_mmx.o:
        $(CC) -o $@ -c have_mmx.S
@@ -35,14 +48,14 @@ scale_line_22_yuv_mmx.o: scale_line_22_yuv_mmx.S
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 
                rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend