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

[melted] / src / melted++ / Makefile

diff --git a/src/melted++/Makefile b/src/melted++/Makefile
index 651a443..8696555 100644 (file)
--- a/src/melted++/Makefile
+++ b/src/melted++/Makefile
@@ -1,44 +1,28 @@
-include ../config.mak
+include ../../config.mak
+include config.mak
 INSTALL = install
 
 ifneq ($(targetos), Darwin)
-NAME = libmlt++$(LIBSUF)
+NAME = libmelted++$(LIBSUF)
 TARGET = $(NAME).$(version)
 SONAME = $(NAME).$(soversion)
 LIBFLAGS += -Wl,-soname,$(SONAME)
 else
-NAME = libmlt++$(LIBSUF)
-TARGET = libmlt++.$(version)$(LIBSUF)
-SONAME = libmlt++.$(soversion)$(LIBSUF)
+NAME = libmelted++$(LIBSUF)
+TARGET = libmelted++.$(version)$(LIBSUF)
+SONAME = libmelted++.$(soversion)$(LIBSUF)
 LIBFLAGS += -install_name $(libdir)/$(SONAME) -current_version $(version) -compatibility_version $(soversion)
 endif
 
-OBJS = MltConsumer.o \
-          MltDeque.o \
-          MltEvent.o \
-          MltFactory.o \
-          MltField.o \
-          MltFilter.o \
-          MltFilteredConsumer.o \
-          MltFrame.o \
-          MltGeometry.o \
-          MltMiracle.o \
-          MltMultitrack.o \
-          MltParser.o \
-          MltPlaylist.o \
-          MltProducer.o \
-          MltProfile.o \
-          MltProperties.o \
-          MltPushConsumer.o \
-          MltRepository.o \
-          MltResponse.o \
-          MltService.o \
-          MltTokeniser.o \
-          MltTractor.o \
-          MltTransition.o
+CXXFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
+
+LDFLAGS += -L../melted -lmelted -L../mvcp -lmvcp
+
+OBJS = MltMelted.o \
+          MltResponse.o
 
 SRCS = $(OBJS:.o=.cpp)
-HEADERS = config.h Mlt.h $(OBJS:.o=.h)
+HEADERS = config.h $(OBJS:.o=.h)
 
 all:           $(TARGET)
 
@@ -47,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)
 
@@ -57,12 +44,16 @@ install:
        $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME)
-       $(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt++"
-       $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt++"
-       /sbin/ldconfig 2> /dev/null || true
+       $(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/mlt++"
+       rm -rf "$(DESTDIR)$(prefix)/include/mlt/melted++"
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif