X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=Makefile;h=9db8c7dfdada0066b6c1c960fbe782ed4567e5fb;hb=HEAD;hp=264fdaa107924a0dfc334e7b3cf8824e84d99db0;hpb=6abd125ea166926b39bd593938052a6d9f4f7caa;p=melted

diff --git a/Makefile b/Makefile
index 264fdaa..9db8c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,9 @@
-SUBDIRS = src/framework \
-		  src/inigo \
-		  src/valerie \
-		  src/miracle \
-		  src/humperdink \
-		  src/albino \
-		  src/modules \
-		  profiles
+SUBDIRS = src/mvcp \
+		  src/melted \
+		  src/melted++ \
+		  src/mvcp-client \
+		  src/mvcp-console \
+		  src/modules
 
 all clean:
 	list='$(SUBDIRS)'; \
@@ -33,28 +31,23 @@ 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; \
+	  /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-melted.pc
+	rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-melted++.pc
+	rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-mvcp.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)$(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=melted-$(version)/ HEAD | gzip >melted-$(version).tar.gz