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 4419568db67f64fbca44901ed36492dc97bdb47b..b24a843895f1413021ecac6dd741a2b8b20becdf 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm -lpthread
+
 include ../../../config.mak
 
 TARGET = ../libmltcore$(LIBSUF)
@@ -9,6 +13,9 @@ OBJS = factory.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 \
@@ -16,10 +23,12 @@ OBJS = factory.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 \
@@ -33,12 +42,14 @@ OBJS = factory.o \
 
 ASM_OBJS = 
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm -lpthread
-
 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)
@@ -58,10 +69,11 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 data_fx.properties "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 loader.dict "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 loader.ini "$(DESTDIR)$(prefix)/share/mlt/core"
+       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