Merge branch 'review-1' of git://github.com/rayl/mlt

[mlt] / src / modules / core / Makefile

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index f37b98132ea9d0e922e0190f8c9cb6c2edd62968..b4c3b4399f22b53870b6b09e5373df991200aaf2 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -1,36 +1,46 @@
+include ../../../config.mak
 
-TARGET = ../libmltcore.so
+TARGET = ../libmltcore$(LIBSUF)
 
 OBJS = factory.o \
           producer_colour.o \
+          producer_consumer.o \
           producer_noise.o \
           producer_ppm.o \
           filter_brightness.o \
           filter_channelcopy.o \
+          filter_crop.o \
+          filter_data_feed.o \
+          filter_data_show.o \
           filter_gamma.o \
           filter_greyscale.o \
           filter_luma.o \
           filter_mirror.o \
+          filter_mono.o \
           filter_obscure.o \
           filter_region.o \
+          filter_rescale.o \
           filter_resize.o \
-          filter_volume.o \
+          filter_transition.o \
           filter_watermark.o \
           transition_composite.o \
           transition_luma.o \
           transition_mix.o \
-          transition_region.o 
+          transition_region.o \
+          consumer_null.o
 
-ASM_OBJS = composite_line_yuv_mmx.o
+ASM_OBJS = 
 
-CFLAGS = -O3 -DUSE_MMX -I../../ -Wall -g -D_FILE_OFFSET_BITS=64 -pthread
+CFLAGS += -I../..
+
+LDFLAGS+=-L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(ASM_OBJS)
-               $(CC) -shared -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS)
+               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS)
 
 composite_line_yuv_mmx.o: composite_line_yuv_mmx.S
        $(CC) -o $@ -c composite_line_yuv_mmx.S
@@ -38,12 +48,16 @@ composite_line_yuv_mmx.o: composite_line_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) "$(DESTDIR)$(libdir)/mlt"
+       install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt"
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif