X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=Makefile;h=a755538fc39324fb933a75ee7f812c388cb111ce;hb=8ea022814e4781856eea6767391274dfd5771a37;hp=11dba7d73c584f74966487b7b5cb1c4da82f4e3d;hpb=d6aab64e889e8b27370d585452e2d712a7a948a9;p=melted

diff --git a/Makefile b/Makefile
index 11dba7d..a755538 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,43 @@
-include config.mak
-
 SUBDIRS = src/framework \
-		  src/modules \
 		  src/inigo \
 		  src/valerie \
 		  src/miracle \
 		  src/humperdink \
-		  src/albino
+		  src/albino \
+		  src/modules
 
-all clean depend:
+all clean:
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		$(MAKE) -C $$subdir $@; \
+		$(MAKE) -s -C $$subdir depend || exit 1; \
+		$(MAKE) -C $$subdir $@ || exit 1; \
 	done
 
-dist-clean:
-	rm mlt-config packages.dat config.mak; \
+distclean:
+	rm mlt-config packages.dat; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		$(MAKE) -C $$subdir $@; \
-	done
+		$(MAKE) -C $$subdir $@ || exit 1; \
+	done; \
+	rm config.mak;
 
+dist-clean: distclean
+
+include config.mak
 
 install:
-	install -d "$(prefix)/bin"
-	install -d "$(prefix)/include"
-	install -d "$(prefix)/lib"
-	install -d "$(prefix)/share/mlt/modules"
-	install -c -m 755 mlt-config "$(bindir)"
-	install -m 644 packages.dat "$(prefix)/share/mlt/"
+	install -d "$(DESTDIR)$(prefix)/bin"
+	install -d "$(DESTDIR)$(prefix)/include"
+	install -d "$(DESTDIR)$(libdir)"
+	install -d "$(DESTDIR)$(libdir)/pkgconfig"
+	install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
+	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) -C $$subdir $@; \
+		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
 	done; \
-	/sbin/ldconfig || true
-
+	if test -z "$(DESTDIR)"; then \
+	  /sbin/ldconfig || true; \
+	fi