Use CXX rather than CC for linking C++ (3090682)

[mlt] / src / modules / kino / Makefile

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index e6f780bf6af763dbc949658e91302c0d55bace8a..984838613452a49372169d91b052309b2f0d8428 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -1,18 +1,22 @@
+CFLAGS += -I../../
+CXXFLAGS += $(CFLAGS) -Wno-deprecated
+
+LDFLAGS += -L../../framework -lmlt -lpthread
+
 include ../../../config.mak
 include config.mak
 
-TARGET=../libmltkino.so
+TARGET = ../libmltkino.so
+
+OBJS = factory.o producer_kino.o
+CPPOBJS = kino_wrapper.o avi.o error.o filehandler.o riff.o
 
-OBJS=factory.o producer_kino.o
-CPPOBJS=kino_wrapper.o avi.o error.o filehandler.o riff.o
-CFLAGS+=-I../../
-LDFLAGS+=-L../../framework -lmlt -lstdc++
-CXXFLAGS+=$(CFLAGS) -Wno-deprecated
+LDFLAGS += -lstdc++
 
 ifdef HAVE_LIBQUICKTIME
-CFLAGS+=`lqt-config --cflags` 
-CXXFLAGS+=`lqt-config --cflags` 
-LDFLAGS+=`lqt-config --libs`
+CFLAGS += `pkg-config --cflags libquicktime` 
+CXXFLAGS += `pkg-config --cflags libquicktime` 
+LDFLAGS += `pkg-config --libs libquicktime`
 endif
 
 ifdef HAVE_LIBDV
@@ -26,7 +30,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cc)
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(CPPOBJS)
-               $(CC) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
+               $(CXX) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -38,7 +42,7 @@ clean:
                rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend