adopt to winsock

[melted] / Makefile

diff --git a/Makefile b/Makefile
index cf1e7a1..9db8c7d 100644 (file)
--- 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,17 +20,34 @@ dist-clean:
        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)/lib/pkgconfig"
-       install -d "$(prefix)/share/mlt/modules"
-       install -c -m 755 mlt-config "$(bindir)"
-       install -c -m 644 *.pc "$(prefix)/lib/pkgconfig"
-       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)/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) -C $$subdir $@ || exit 1; \
+               $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
        done; \
-       /sbin/ldconfig || true
+       if test -z "$(DESTDIR)"; then \
+         /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