Fix build of melted++ (cont'd).

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --git a/Makefile b/Makefile
index afcde6b..136351c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 SUBDIRS = src/mvcp \
                  src/melted \
-                 src/melted-client \
-                 src/melted-console \
+                 src/melted++ \
+                 src/mvcp-client \
+                 src/mvcp-console \
                  src/modules
 
 all clean:
@@ -30,7 +31,6 @@ 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"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \

diff --git a/configure b/configure
index 8dad6bc..398d2e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -79,6 +79,7 @@ build_config()
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                FreeBSD)
                [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
@@ -86,6 +87,7 @@ build_config()
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                *)
                ;;

diff --git a/src/melted++/Makefile b/src/melted++/Makefile
index 82f49b9..8696555 100644 (file)
--- a/src/melted++/Makefile
+++ b/src/melted++/Makefile
@@ -31,6 +31,9 @@ $(TARGET):    $(OBJS)
        ln -sf $(TARGET) $(NAME)
        ln -sf $(TARGET) $(SONAME)
 
+depend: $(SRCS)
+       $(CXX) -MM $(CXXFLAGS) $^ 1>.depend
+
 clean:
        $(RM) $(OBJS) $(TARGET) $(NAME)
 
@@ -41,15 +44,15 @@ install:
        $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME)
-       $(INSTALL) -d "$(DESTDIR)$(prefix)/include/melted++"
-       $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/melted++"
+       $(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt/melted++"
+       $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt/melted++"
        /sbin/ldconfig -n "$(DESTDIR)$(liobdir)" 2> /dev/null || true
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
        rm -f "$(DESTDIR)$(libdir)/$(NAME)"
        rm -f "$(DESTDIR)$(libdir)/$(SONAME)"
-       rm -rf "$(DESTDIR)$(prefix)/include/melted++"
+       rm -rf "$(DESTDIR)$(prefix)/include/mlt/melted++"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/melted++/configure b/src/melted++/configure
index 79620ce..bf830ad 100755 (executable)
--- a/src/melted++/configure
+++ b/src/melted++/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "soversion=0" > config.mak
-echo "melted++ -I$prefix/include -I$prefix/include/melted++ -D_REENTRANT       -L$libdir -lmelted++" >> ../../packages.dat
+echo "melted++ -I$prefix/include -I$prefix/include/mlt/melted++ -D_REENTRANT   -L$libdir -lmelted++" >> ../../packages.dat
 
 WARNINGS="-W -Wwrite-strings -Wcast-qual -Wpointer-arith -Wcast-align -Wredundant-decls"
 

diff --git a/src/modules/mvcp/configure b/src/modules/mvcp/configure
deleted file mode 100755 (executable)
index 6a56196..0000000
--- a/src/modules/mvcp/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$help" != "1" ]
-then
-       echo "- pending move to melted: disabling"
-       touch ../disable-mvsp
-fi