Merge branch 'review-2' of git://github.com/rayl/mlt

[melted] / Makefile

diff --git a/Makefile b/Makefile
index 2a062c8..afbaecb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
-include config.mak
-
 SUBDIRS = src/framework \
                  src/inigo \
                  src/valerie \
                  src/miracle \
                  src/humperdink \
                  src/albino \
-                 src/modules
+                 src/modules \
+                 profiles
 
 all clean:
        list='$(SUBDIRS)'; \
@@ -15,7 +14,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 +22,40 @@ 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 -d "$(DESTDIR)$(libdir)"
+       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)$(prefix)/lib/pkgconfig"
+       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 || true; \
+         /sbin/ldconfig 2> /dev/null || true; \
        fi
+
+uninstall:
+       rm -f "$(DESTDIR)$(bindir)"/mlt-config
+       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)$(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)"
+       svn log > "mlt-$(version)/ChangeLog"
+       tar -cvzf "mlt-$(version).tar.gz" "mlt-$(version)"