Fix composite_copy_region on locale using comma for decimal.

[mlt] / src / modules / core / Makefile

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 1e4cab1f4e8518ab06ede971a11478ca48248f8a..b24a843895f1413021ecac6dd741a2b8b20becdf 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -1,20 +1,34 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm -lpthread
+
 include ../../../config.mak
 
 TARGET = ../libmltcore$(LIBSUF)
 
 OBJS = factory.o \
           producer_colour.o \
+          producer_consumer.o \
+          producer_hold.o \
+          producer_loader.o \
           producer_noise.o \
           producer_ppm.o \
+          filter_audiochannels.o \
+          filter_audioconvert.o \
+          filter_audiowave.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_imageconvert.o \
           filter_luma.o \
           filter_mirror.o \
+          filter_mono.o \
           filter_obscure.o \
+          filter_panner.o \
           filter_region.o \
           filter_rescale.o \
           filter_resize.o \
@@ -28,12 +42,14 @@ OBJS = factory.o \
 
 ASM_OBJS = 
 
-CFLAGS += -I../..
-
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
+ifeq ($(targetos), MinGW)
+CFLAGS += -I../../win32
+OBJS += ../../win32/fnmatch.o
+SRCS += ../../win32/fnmatch.c
+endif
+
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(ASM_OBJS)
@@ -45,15 +61,19 @@ 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) "$(prefix)/share/mlt/modules"
-       install -m 644 ../data_fx.properties "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -d "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 data_fx.properties "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 loader.dict "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 loader.ini "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/core"
 
 ifneq ($(wildcard .depend),)
 include .depend