+ Added a --libdir switch to the configure and build and fixed test case compilation

[melted] / mlt++ / src / Makefile

diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 94b3ad9..5d205b8 100644 (file)
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -1,20 +1,28 @@
 include ../config.mak
-CXXFLAGS = -Wall -pthread `mlt-config --cflags`
-LDFLAGS = `mlt-config --libs`
 INSTALL = install
 
-TARGET = libmlt++.so
+TARGET = libmlt++$(LIBSUF)
 
 OBJS = MltConsumer.o \
+          MltDeque.o \
+          MltEvent.o \
           MltFactory.o \
+          MltField.o \
           MltFilter.o \
           MltFilteredConsumer.o \
-          MltFilteredProducer.o \
           MltFrame.o \
+          MltGeometry.o \
+          MltMiracle.o \
+          MltMultitrack.o \
+          MltParser.o \
           MltPlaylist.o \
           MltProducer.o \
           MltProperties.o \
+          MltPushConsumer.o \
+          MltResponse.o \
           MltService.o \
+          MltTokeniser.o \
+          MltTractor.o \
           MltTransition.o
 
 SRCS = $(OBJS:.o=.cpp)
@@ -26,14 +34,15 @@ CC=g++
 all:           $(TARGET)
 
 $(TARGET):     $(OBJS)
-       $(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 clean:
        $(RM) $(OBJS) $(TARGET)
 
 install:
-       $(INSTALL) -m 755 $(TARGET) $(prefix)/lib
-       $(INSTALL) -d "$(prefix)/include/mlt++"
-       $(INSTALL) -m 644 $(HEADERS) "$(prefix)/include/mlt++"
+       $(INSTALL) -d "$(DESTDIR)$(libdir)"
+       $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)
+       $(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt++"
+       $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt++"
        /sbin/ldconfig || true