Merge ../mlt

[melted] / src / modules / sdl / Makefile

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index f9aac55..e2b5b36 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -1,5 +1,7 @@
 include ../../../config.mak
 
+include config.mak
+
 TARGET = ../libmltsdl$(LIBSUF)
 
 OBJS = factory.o \
@@ -8,16 +10,23 @@ OBJS = factory.o \
           consumer_sdl_still.o 
 
 ifeq ($(targetos),Darwin)
-       CFLAGS +=-ObjC
-       LDFLAGS +=-lobjc -framework Foundation
+CFLAGS += -ObjC
+LDFLAGS += -lobjc -framework Foundation
+else
+LDFLAGS += -lX11
 endif
 
-CFLAGS +=-I../.. `sdl-config --cflags`
-
-LDFLAGS +=`sdl-config --libs`
+CFLAGS += -I../..
+CFLAGS += `sdl-config --cflags`
 
-LDFLAGS +=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
+LDFLAGS += `sdl-config --libs`
 
+ifeq ($(WITH_SDL_IMAGE),1)
+OBJS += producer_sdl_image.o
+CFLAGS += -DWITH_SDL_IMAGE
+LDFLAGS += -lSDL_image
+endif
 
 SRCS := $(OBJS:.o=.c)
 
@@ -29,14 +38,14 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend