Add mlt_audio_format_size().

[mlt] / Makefile

diff --git a/Makefile b/Makefile
index 5d127b438f6371ac805eb34d43f7e3097eb9457d..de66bb7407151d1c12bb9a530442973d726503c2 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:
@@ -30,22 +28,22 @@ install:
        install -d "$(DESTDIR)$(prefix)/bin"
        install -d "$(DESTDIR)$(prefix)/include"
        install -d "$(DESTDIR)$(libdir)"
+       install -d "$(DESTDIR)$(libdir)/mlt"
        install -d "$(DESTDIR)$(libdir)/pkgconfig"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
-       install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
+       install -d "$(DESTDIR)$(prefix)/share/mlt"
        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 || true; \
-       fi
+#      if test -z "$(DESTDIR)"; then \
+#        /sbin/ldconfig -n "$(DESTDIR)$(libdir)" 2> /dev/null || true; \
+#      fi
 
 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; \
@@ -54,7 +52,4 @@ uninstall:
        rm -rf "$(DESTDIR)$(prefix)/share/mlt"
 
 dist:
-       [ -d "mlt-$(version)" ] && rm -rf "mlt-$(version)" || echo
-       svn export . "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