X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=e5b17f2441c8c605a62e394f016f239e70ea8e1d;hb=e273c00863839656468d7273759fe8d5daddac23;hp=afbaecb7bd854937482398f961843ef487ec809f;hpb=197f0cbbd9016e438c121f75da53380bec507a39;p=mlt

diff --git a/Makefile b/Makefile
index afbaecb7..e5b17f24 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:
@@ -30,32 +28,41 @@ install:
 	install -d "$(DESTDIR)$(prefix)/bin"
 	install -d "$(DESTDIR)$(prefix)/include"
 	install -d "$(DESTDIR)$(libdir)"
-	install -d "$(DESTDIR)$(libdir)/mlt"
+	install -d "$(DESTDIR)$(moduledir)"
+ifeq ($(extra_versioning), true)
+	ln -s "$(moduledir)" "$(DESTDIR)$(unversionedmoduledir)"
+endif
 	install -d "$(DESTDIR)$(libdir)/pkgconfig"
-	install -d "$(DESTDIR)$(prefix)/share/mlt"
-	install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
+	install -d "$(DESTDIR)$(mltdatadir)"
+ifeq ($(extra_versioning), true)
+	ln -s "$(mltdatadir)" "$(DESTDIR)$(unversionedmltdatadir)"
+endif
 	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)$(mltdatadir)"
 
 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; \
 	done
 	rm -rf "$(DESTDIR)$(prefix)/include/mlt"
+	rm -rf "$(DESTDIR)$(mltdatadir)"
+ifeq ($(compat_dirs), true)
 	rm -rf "$(DESTDIR)$(prefix)/share/mlt"
+endif
 
 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