X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fsrc%2FMakefile;h=5d205b80d44897c67ae792bce47d1bed54e8c0b8;hb=3e27e17ee89f8ba89d53fbb9fc36f3b780c639f9;hp=79601d6d4a90d2350f0be6a6b6b478a65d87d522;hpb=86d5ec6413cb945b81475a91ee998b46c6c95a73;p=melted

diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 79601d6..5d205b8 100644
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -1,25 +1,27 @@
 include ../config.mak
-CXXFLAGS = -Wall -fPIC -DPIC -pthread `mlt-config --cflags`
-LDFLAGS = `mlt-config --libs` `mlt-config miracle --libs`
 INSTALL = install
 
-TARGET = libmlt++.so
+TARGET = libmlt++$(LIBSUF)
 
 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 \
 	   MltProperties.o \
+	   MltPushConsumer.o \
 	   MltResponse.o \
 	   MltService.o \
+	   MltTokeniser.o \
 	   MltTractor.o \
 	   MltTransition.o
 
@@ -32,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