Fix some race conditions in mlt_consumer.

[mlt] / src / framework / Makefile

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 5ee621fdecd85be2df726b62b3026b3de7c5a88d..2c3eac9d5804e7b7a70640ce0a74e0669b70421c 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -1,19 +1,31 @@
 include ../../config.mak
+include config.mak
 
 NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
 
-ifneq ($(targetos), Darwin)
+ifeq ($(targetos), Darwin)
 NAME = libmlt$(LIBSUF)
-TARGET = $(NAME).$(version)
-SHFLAGS += -Wl,-soname,$(TARGET)
+TARGET = libmlt.$(version)$(LIBSUF)
+SONAME = libmlt.$(soversion)$(LIBSUF)
+SHFLAGS += -install_name $(libdir)/$(SONAME) -current_version $(version) -compatibility_version $(soversion)
+else ifeq ($(targetos), MinGW)
+NAME = libmlt$(LIBSUF)
+TARGET = libmlt-$(soversion)$(LIBSUF)
+SHFLAGS += -Wl,--output-def,libmlt.def
 else
 NAME = libmlt$(LIBSUF)
-TARGET = libmlt.$(version)$(LIBSUF)
-SHFLAGS += -install_name $(libdir)/$(TARGET)
+TARGET = $(NAME).$(version)
+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 \
           mlt_deque.o \
           mlt_property.o \
@@ -33,9 +45,13 @@ OBJS = mlt_frame.o \
           mlt_repository.o \
           mlt_pool.o \
           mlt_tokeniser.o \
-          mlt_profile.o
+          mlt_profile.o \
+          mlt_log.o \
+          mlt_cache.o \
+          mlt_animation.o
 
 INCS = mlt_consumer.h \
+          mlt_version.h \
           mlt_factory.h \
           mlt_filter.h \
           mlt.h \
@@ -57,19 +73,30 @@ INCS = mlt_consumer.h \
           mlt_service.h  \
           mlt_transition.h \
           mlt_tokeniser.h \
-          mlt_profile.h
+          mlt_profile.h \
+          mlt_log.h \
+          mlt_cache.h \
+          mlt_animation.h
 
 SRCS := $(OBJS:.o=.c)
 
-CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
+ifeq ($(targetos), MinGW)
+OBJS += ../win32/win32.o
+SRCS += ../win32/win32.c
+endif
+
+CFLAGS += $(RDYNAMIC) -DPREFIX_DATA="\"$(mltdatadir)\"" -DPREFIX_LIB="\"$(moduledir)\""
 
-LDFLAGS += -lm $(LIBDL) -lpthread
+LDFLAGS += $(LIBDL) -lpthread -lm
 
 all:   $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
                ln -sf $(TARGET) $(NAME)
+               if [ "$(targetos)" != "MinGW" ]; then \
+                       ln -sf $(TARGET) $(SONAME) ; \
+               fi
 
 depend:        $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -78,19 +105,32 @@ distclean: clean
                rm -f .depend
 
 clean: 
-               rm -f $(OBJS) $(TARGET) $(NAME)
+               rm -f $(OBJS) $(TARGET) $(NAME) $(SONAME)
 
 install:
        install -d $(DESTDIR)$(libdir)
-       install -m 755 $(TARGET) $(DESTDIR)$(libdir)
-       ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
+       if [ "$(targetos)" = "MinGW" ]; then \
+               install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \
+               install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \
+               install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \
+       else \
+               install -m 755 $(TARGET) $(DESTDIR)$(libdir) ; \
+               ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME) ; \
+               ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME) ; \
+       fi
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
+       install -d "$(DESTDIR)$(mltdatadir)"
+       install -m 644 metaschema.yaml "$(DESTDIR)$(mltdatadir)"
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
-       rm -f "$(DESTDIR)$(libdir)/$(NAME)"
+       if [ "$(targetos)" != "MinGW" ]; then \
+               rm -f "$(DESTDIR)$(libdir)/$(SONAME)" ; \
+               rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \
+       fi
        rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
+       rm -f "$(DESTDIR)$(mltdatadir)/metaschema.yaml"
 
 ifneq ($(wildcard .depend),)
 include .depend