partially fix leak of service allocated in on_start_xxx

[mlt] / Makefile

diff --git a/Makefile b/Makefile
index afbaecb7bd854937482398f961843ef487ec809f..fbdf16d6abfaa973a7cba008948cf9c1ffaa4aad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
 SUBDIRS = src/framework \
-                 src/inigo \
-                 src/valerie \
-                 src/miracle \
-                 src/humperdink \
-                 src/albino \
+                 src/mlt++ \
+                 src/melt \
                  src/modules \
+                 src/swig \
                  profiles
 
 all clean:
@@ -33,20 +31,17 @@ install:
        install -d "$(DESTDIR)$(libdir)/mlt"
        install -d "$(DESTDIR)$(libdir)/pkgconfig"
        install -d "$(DESTDIR)$(prefix)/share/mlt"
-       install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
        install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
-       install -m 644 packages.dat "$(DESTDIR)$(prefix)/share/mlt/"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
-       done; \
-       if test -z "$(DESTDIR)"; then \
-         /sbin/ldconfig 2> /dev/null || true; \
-       fi
+       done
+       cp -R presets "$(DESTDIR)$(prefix)/share/mlt"
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)"/mlt-config
-       rm -f "$(DESTDIR)$(libdir)/pkgconfig/mlt-*.pc"
+       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-framework.pc
+       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt++.pc
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
@@ -55,7 +50,10 @@ uninstall:
        rm -rf "$(DESTDIR)$(prefix)/share/mlt"
 
 dist:
-       [ -d "mlt-$(version)" ] && rm -rf "mlt-$(version)" || echo
-       svn export http://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt "mlt-$(version)"
-       svn log > "mlt-$(version)/ChangeLog"
-       tar -cvzf "mlt-$(version).tar.gz" "mlt-$(version)"
+       git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz
+
+validate-yml:
+       for file in `find src/modules -type f -name \*.yml`; do \
+               echo "validate: $$file"; \
+               kwalify -f src/framework/metaschema.yaml $$file || exit 1; \
+       done