X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=Makefile;h=9db8c7dfdada0066b6c1c960fbe782ed4567e5fb;hb=fea346dab32efbc7dba10246d66cab7ace9d4055;hp=2a062c8f1ce4ee00ae39cb0d3abfa0e51fc65cb2;hpb=34c7916b96a65dbfb6d9414aca781d6292474f98;p=melted

diff --git a/Makefile b/Makefile
index 2a062c8..9db8c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
-include config.mak
-
-SUBDIRS = src/framework \
-		  src/inigo \
-		  src/valerie \
-		  src/miracle \
-		  src/humperdink \
-		  src/albino \
+SUBDIRS = src/mvcp \
+		  src/melted \
+		  src/melted++ \
+		  src/mvcp-client \
+		  src/mvcp-console \
 		  src/modules
 
 all clean:
@@ -15,7 +12,7 @@ all clean:
 		$(MAKE) -C $$subdir $@ || exit 1; \
 	done
 
-dist-clean:
+distclean:
 	rm mlt-config packages.dat; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
@@ -23,19 +20,34 @@ dist-clean:
 	done; \
 	rm config.mak;
 
+dist-clean: distclean
+
+include config.mak
+
 install:
 	install -d "$(DESTDIR)$(prefix)/bin"
 	install -d "$(DESTDIR)$(prefix)/include"
-	install -d "$(DESTDIR)$(prefix)/lib"
-	install -d "$(DESTDIR)$(prefix)/lib/pkgconfig"
-	install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
-	install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
-	install -c -m 644 *.pc "$(DESTDIR)$(prefix)/lib/pkgconfig"
-	install -m 644 packages.dat "$(DESTDIR)$(prefix)/share/mlt/"
+	install -d "$(DESTDIR)$(libdir)"
+	install -d "$(DESTDIR)$(libdir)/mlt"
+	install -d "$(DESTDIR)$(libdir)/pkgconfig"
+	install -d "$(DESTDIR)$(prefix)/share/mlt"
+	install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
 		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
 	done; \
 	if test -z "$(DESTDIR)"; then \
-	  /sbin/ldconfig || true; \
+	  /sbin/ldconfig -n "$(DESTDIR)$(libdir)" 2> /dev/null || true; \
 	fi
+
+uninstall:
+	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
+
+dist:
+	git archive --format=tar --prefix=melted-$(version)/ HEAD | gzip >melted-$(version).tar.gz