X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=136171b1d8d86891d2f4332e924a19318a527224;hb=3c7358dba7a0cdc7975b496d8b3e0fcd2f7d39e7;hp=264fdaa107924a0dfc334e7b3cf8824e84d99db0;hpb=6abd125ea166926b39bd593938052a6d9f4f7caa;p=mlt

diff --git a/Makefile b/Makefile
index 264fdaa1..136171b1 100644
--- 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,6 +50,4 @@ 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)"
-	tar -cvzf "mlt-$(version).tar.gz" "mlt-$(version)"
+	git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz