Fix some race conditions in mlt_consumer.

[mlt] / src / framework / Makefile

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 004d3e5ad21f05f5f56cd42ecf8d769b7761e1a3..2c3eac9d5804e7b7a70640ce0a74e0669b70421c 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -1,4 +1,5 @@
 include ../../config.mak
+include config.mak
 
 NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
@@ -19,6 +20,10 @@ SONAME = $(NAME).$(soversion)
 SHFLAGS += -Wl,-soname,$(SONAME)
 endif
 
+ifeq ($(targetos), Linux)
+SHFLAGS += -Wl,--version-script=mlt.vers
+endif
+
 OBJS = mlt_frame.o \
           mlt_version.o \
           mlt_geometry.o \
@@ -42,7 +47,8 @@ OBJS = mlt_frame.o \
           mlt_tokeniser.o \
           mlt_profile.o \
           mlt_log.o \
-          mlt_cache.o
+          mlt_cache.o \
+          mlt_animation.o
 
 INCS = mlt_consumer.h \
           mlt_version.h \
@@ -69,7 +75,8 @@ INCS = mlt_consumer.h \
           mlt_tokeniser.h \
           mlt_profile.h \
           mlt_log.h \
-          mlt_cache.h
+          mlt_cache.h \
+          mlt_animation.h
 
 SRCS := $(OBJS:.o=.c)
 
@@ -78,9 +85,9 @@ OBJS += ../win32/win32.o
 SRCS += ../win32/win32.c
 endif
 
-CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" -DMLTDATADIR="\"$(datadir)\""
+CFLAGS += $(RDYNAMIC) -DPREFIX_DATA="\"$(mltdatadir)\"" -DPREFIX_LIB="\"$(moduledir)\""
 
-LDFLAGS += $(LIBDL) -lpthread
+LDFLAGS += $(LIBDL) -lpthread -lm
 
 all:   $(TARGET)
 
@@ -113,8 +120,8 @@ install:
        fi
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
-       install -d "$(DESTDIR)$(datadir)/mlt"
-       install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt/"
+       install -d "$(DESTDIR)$(mltdatadir)"
+       install -m 644 metaschema.yaml "$(DESTDIR)$(mltdatadir)"
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
@@ -123,7 +130,7 @@ uninstall:
                rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \
        fi
        rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
-       rm -f "$(DESTDIR)$(datadir)/mlt/metaschema.yaml"
+       rm -f "$(DESTDIR)$(mltdatadir)/metaschema.yaml"
 
 ifneq ($(wildcard .depend),)
 include .depend