From: Cristian Morales Vega Date: Thu, 7 Feb 2013 09:34:50 +0000 (+0000) Subject: Version modules and data directories, and melt X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=98ef219555b4c44fd349178bf2b60d9d879d10d4;p=mlt Version modules and data directories, and melt Allow the "extras" of binary incompatible versions of MLT to be installed simultaneously. I don't like the idea of versioning the melt binary. But kdenlive is the main user of MLT and it expects the same formats support from both the libmltX it is linked to, and the melt binary it uses to do the actual work. --- diff --git a/Makefile b/Makefile index fbdf16d6..02732640 100644 --- a/Makefile +++ b/Makefile @@ -28,15 +28,21 @@ install: install -d "$(DESTDIR)$(prefix)/bin" install -d "$(DESTDIR)$(prefix)/include" install -d "$(DESTDIR)$(libdir)" - install -d "$(DESTDIR)$(libdir)/mlt" + install -d "$(DESTDIR)$(moduledir)" +ifeq ($(compat_dirs), true) + ln -s "$(moduledir)" "$(DESTDIR)$(libdir)/mlt" +endif install -d "$(DESTDIR)$(libdir)/pkgconfig" - install -d "$(DESTDIR)$(prefix)/share/mlt" + install -d "$(DESTDIR)$(mltdatadir)" +ifeq ($(compat_dirs), true) + ln -s "$(mltdatadir)" "$(DESTDIR)$(prefix)/share/mlt" +endif install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig" list='$(SUBDIRS)'; \ for subdir in $$list; do \ $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \ done - cp -R presets "$(DESTDIR)$(prefix)/share/mlt" + cp -R presets "$(DESTDIR)$(mltdatadir)" uninstall: rm -f "$(DESTDIR)$(bindir)"/mlt-config @@ -47,7 +53,10 @@ uninstall: $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \ done rm -rf "$(DESTDIR)$(prefix)/include/mlt" + rm -rf "$(DESTDIR)$(mltdatadir)" +ifeq ($(compat_dirs), true) rm -rf "$(DESTDIR)$(prefix)/share/mlt" +endif dist: git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz diff --git a/configure b/configure index 0c41f518..e935e19c 100755 --- a/configure +++ b/configure @@ -18,6 +18,8 @@ General build options: --libdir=directory - lib directory (default: $prefix/lib) --datadir=directory - data directory (default: $prefix/share) --mandir=directory - man documentation directory (default: $prefix/share/man) + --rename-melt - Give melt executable a different name. + --no-compat-dirs - Do not create compatibility, unversioned, files and directories --enable-gpl - Enable GPLv2 components --enable-gpl3 - Enable GPLv3 components --enable-debug - Compile without optimizations support (default: off) @@ -55,6 +57,8 @@ build_config() echo "bindir=$prefix/bin" echo "datadir=$datadir" echo "mandir=$mandir" + echo "compat_dirs=$compat_dirs" + echo "compat_nomelt=$compat_nomelt" echo "targetos=$targetos" [ "$mmx" = "true" ] && @@ -128,6 +132,9 @@ build_config() ;; esac echo "LIBSUF=$LIBSUF" + echo "moduledir=${libdir}/mlt-${soversion}" + echo "mltdatadir=${datadir}/mlt-${soversion}" + echo "meltname=${meltname}" ) > config.mak echo "#!/bin/sh" > mlt-config @@ -155,6 +162,9 @@ build_pkgconfig() echo version=$version echo cflags=`grep ^framework packages.dat | cut -f 2` echo libs=`grep ^framework packages.dat | cut -f 3` + echo moduledir=${libdir}/mlt-${soversion} + echo mltdatadir=${datadir}/mlt-${soversion} + echo meltbin=${prefix}/bin/${meltname} ) >> mlt-framework.pc cat mlt-framework.pc.in >>mlt-framework.pc @@ -194,6 +204,8 @@ export cpu= export targetos=$(uname -s) export targetarch= export amd64=false +export compat_dirs=true +export compat_nomelt=false # Define the compiler used in tests (gcc is not installed everywhere) : ${CC:=gcc} @@ -207,6 +219,8 @@ do --libdir=* ) libdir="${i#--libdir=}" ;; --datadir=* ) datadir="${i#--datadir=}" ;; --mandir=* ) mandir="${i#--mandir=}" ;; + --rename-melt=* ) meltname="${i#--rename-melt=}"; compat_nomelt=true ;; + --no-compat-dirs ) compat_dirs=false ;; --enable-debug ) optimisations=false ;; --disable-debug ) debug=false ;; --disable-mmx ) mmx=false; sse=false; sse2=false ;; @@ -221,6 +235,11 @@ do esac done +if [ -z "${meltname}" ] +then + meltname=melt${soversion} +fi + # Chose appropriate suffix for libraries case $targetos in Darwin) @@ -253,6 +272,9 @@ export LIBSUF [ "$datadir" = "" ] && datadir=$prefix/share [ "$mandir" = "" ] && mandir=$prefix/share/man +export moduledir=${libdir}/mlt-${soversion} +export mltdatadir=${datadir}/mlt-${soversion} + # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly) if [ "$mmx" = "true" ] then diff --git a/profiles/Makefile b/profiles/Makefile index 4e07644d..cc6ff46b 100644 --- a/profiles/Makefile +++ b/profiles/Makefile @@ -9,10 +9,10 @@ distclean: clean: install: all uninstall - install -d "$(DESTDIR)$(datadir)/mlt/profiles" - install -m 644 * "$(DESTDIR)$(datadir)/mlt/profiles" - rm -f "$(DESTDIR)$(datadir)/mlt/profiles/"*~ - rm -f "$(DESTDIR)$(datadir)/mlt/profiles/Makefile" + install -d "$(DESTDIR)$(mltdatadir)/profiles" + install -m 644 * "$(DESTDIR)$(mltdatadir)/profiles" + rm -f "$(DESTDIR)$(mltdatadir)/profiles/"*~ + rm -f "$(DESTDIR)$(mltdatadir)/profiles/Makefile" uninstall: - rm -rf "$(DESTDIR)$(datadir)/mlt/profiles" + rm -rf "$(DESTDIR)$(mltdatadir)/profiles" diff --git a/src/framework/Makefile b/src/framework/Makefile index fcb7a29b..6c648601 100644 --- a/src/framework/Makefile +++ b/src/framework/Makefile @@ -79,7 +79,7 @@ OBJS += ../win32/win32.o SRCS += ../win32/win32.c endif -CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" -DMLTDATADIR="\"$(datadir)\"" +CFLAGS += $(RDYNAMIC) -DPREFIX_DATA="\"$(mltdatadir)\"" -DPREFIX_LIB="\"$(moduledir)\"" LDFLAGS += $(LIBDL) -lpthread @@ -114,8 +114,8 @@ install: fi install -d "$(DESTDIR)$(prefix)/include/mlt/framework" install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework" - install -d "$(DESTDIR)$(datadir)/mlt" - install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt/" + install -d "$(DESTDIR)$(mltdatadir)" + install -m 644 metaschema.yaml "$(DESTDIR)$(mltdatadir)" uninstall: rm -f "$(DESTDIR)$(libdir)/$(TARGET)" @@ -124,7 +124,7 @@ uninstall: rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \ fi rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework" - rm -f "$(DESTDIR)$(datadir)/mlt/metaschema.yaml" + rm -f "$(DESTDIR)$(mltdatadir)/metaschema.yaml" ifneq ($(wildcard .depend),) include .depend diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c index cf126182..5c0c877f 100644 --- a/src/framework/mlt_factory.c +++ b/src/framework/mlt_factory.c @@ -41,11 +41,6 @@ #define PREFIX_LIB "/lib/mlt" /** the default subdirectory of the install prefix for holding module (plugin) data */ #define PREFIX_DATA "/share/mlt" -#else -/** the default subdirectory of the libdir for holding modules (plugins) */ -#define PREFIX_LIB LIBDIR "/mlt" -/** the default subdirectory of the install prefix for holding module (plugin) data */ -#define PREFIX_DATA MLTDATADIR "/mlt" #endif /** holds the full path to the modules directory - initialized and retained for the entire session */ diff --git a/src/melt/Makefile b/src/melt/Makefile index c21ef0d3..39e8363c 100644 --- a/src/melt/Makefile +++ b/src/melt/Makefile @@ -1,5 +1,4 @@ include ../../config.mak -include config.mak OBJS = melt.o \ io.o @@ -18,9 +17,9 @@ endif bindir = $(prefix) endif -all: $(TARGET) +all: $(meltname) -$(TARGET): $(OBJS) +$(meltname): $(OBJS) $(CC) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) @@ -30,14 +29,24 @@ distclean: clean rm -f .depend clean: - rm -f $(OBJS) $(TARGET) + rm -f $(OBJS) $(meltname) install: all install -d "$(DESTDIR)$(bindir)" - install -c -m 755 $(TARGET) "$(DESTDIR)$(bindir)" + install -c -m 755 $(meltname) "$(DESTDIR)$(bindir)" +ifeq ($(compat_dirs), true) +ifneq ($(compat_nomelt), true) + ln -s $(meltname) "$(DESTDIR)$(bindir)/melt" +endif +endif uninstall: - rm -f "$(DESTDIR)$(bindir)/$(TARGET)" + rm -f "$(DESTDIR)$(bindir)/$(meltname)" +ifeq ($(compat_dirs), true) +ifneq ($(compat_nomelt), true) + rm -f "$(DESTDIR)$(bindir)/melt" +endif +endif ifneq ($(wildcard .depend),) include .depend diff --git a/src/melt/configure b/src/melt/configure deleted file mode 100755 index c109c84b..00000000 --- a/src/melt/configure +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -if [ "$help" = "1" ] -then - cat << EOF -Melt options: - - --rename-melt=name - Give melt executable a different name. - -EOF - -else - target=melt - for i in "$@" - do - case $i in - --rename-melt=* ) target="${i#--rename-melt=}" ;; - esac - done - echo "TARGET=$target" > config.mak -fi diff --git a/src/modules/Makefile b/src/modules/Makefile index fcbf3ea6..928b1fdd 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -27,5 +27,5 @@ install: done uninstall: - rm -rf "$(DESTDIR)$(libdir)/mlt" + rm -rf "$(DESTDIR)$(moduledir)" diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile index 14ecbb84..eceb3759 100644 --- a/src/modules/avformat/Makefile +++ b/src/modules/avformat/Makefile @@ -65,15 +65,15 @@ clean: rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/avformat" - install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat" - install -m 644 consumer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/avformat" + install -m 644 producer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat" + install -m 644 consumer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat" uninstall: - rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true - rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true - rm -rf "$(DESTDIR)$(datadir)/mlt/avformat" + rm "$(DESTDIR)$(moduledir)/libmltavformat$(LIBSUF)" 2> /dev/null || true + rm "$(DESTDIR)$(moduledir)/libmltffmpeg$(LIBSUF)" 2> /dev/null || true + rm -rf "$(DESTDIR)$(mltdatadir)/avformat" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile index 3426039e..b7981f4a 100644 --- a/src/modules/core/Makefile +++ b/src/modules/core/Makefile @@ -77,12 +77,12 @@ clean: rm -f $(OBJS) $(ASM_OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/core" - install -m 644 data_fx.properties "$(DESTDIR)$(datadir)/mlt/core" - install -m 644 loader.dict "$(DESTDIR)$(datadir)/mlt/core" - install -m 644 loader.ini "$(DESTDIR)$(datadir)/mlt/core" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/core" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/core" + install -m 644 data_fx.properties "$(DESTDIR)$(mltdatadir)/core" + install -m 644 loader.dict "$(DESTDIR)$(mltdatadir)/core" + install -m 644 loader.ini "$(DESTDIR)$(mltdatadir)/core" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/core" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/decklink/Makefile b/src/modules/decklink/Makefile index 3695d5fa..c9798b4f 100755 --- a/src/modules/decklink/Makefile +++ b/src/modules/decklink/Makefile @@ -45,13 +45,13 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/decklink" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/decklink" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/decklink" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/decklink" uninstall: - rm "$(DESTDIR)$(libdir)/mlt/libmltdecklink$(LIBSUF)" 2> /dev/null || true - rm -rf "$(DESTDIR)$(datadir)/mlt/decklink" + rm "$(DESTDIR)$(moduledir)/libmltdecklink$(LIBSUF)" 2> /dev/null || true + rm -rf "$(DESTDIR)$(mltdatadir)/decklink" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/dgraft/Makefile b/src/modules/dgraft/Makefile index 0fbf5f6e..f1dfbfef 100644 --- a/src/modules/dgraft/Makefile +++ b/src/modules/dgraft/Makefile @@ -26,7 +26,7 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile index 48c6c5b0..4252ef14 100644 --- a/src/modules/dv/Makefile +++ b/src/modules/dv/Makefile @@ -31,9 +31,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/dv" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/dv" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/dv" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/dv" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile index 8887374d..b52d2633 100644 --- a/src/modules/effectv/Makefile +++ b/src/modules/effectv/Makefile @@ -28,9 +28,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/effectv" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/effectv" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/effectv" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/effectv" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile index 2388dc1e..45bd7aed 100644 --- a/src/modules/feeds/Makefile +++ b/src/modules/feeds/Makefile @@ -9,7 +9,7 @@ distclean: clean: install: all - install -d "$(DESTDIR)$(datadir)/mlt/feeds/PAL" - install -d "$(DESTDIR)$(datadir)/mlt/feeds/NTSC" - install -m 644 PAL/*.* "$(DESTDIR)$(datadir)/mlt/feeds/PAL" - install -m 644 NTSC/*.* "$(DESTDIR)$(datadir)/mlt/feeds/NTSC" + install -d "$(DESTDIR)$(mltdatadir)/feeds/PAL" + install -d "$(DESTDIR)$(mltdatadir)/feeds/NTSC" + install -m 644 PAL/*.* "$(DESTDIR)$(mltdatadir)/feeds/PAL" + install -m 644 NTSC/*.* "$(DESTDIR)$(mltdatadir)/feeds/NTSC" diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile index 7abbb74b..5b7a33c7 100644 --- a/src/modules/frei0r/Makefile +++ b/src/modules/frei0r/Makefile @@ -34,10 +34,10 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(prefix)/share/mlt/frei0r" - install -m 644 blacklist.txt "$(DESTDIR)$(datadir)/mlt/frei0r" - install -m 644 not_thread_safe.txt "$(DESTDIR)$(datadir)/mlt/frei0r" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/frei0r" + install -m 644 blacklist.txt "$(DESTDIR)$(mltdatadir)/frei0r" + install -m 644 not_thread_safe.txt "$(DESTDIR)$(mltdatadir)/frei0r" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile index acf161c2..5712644f 100644 --- a/src/modules/gtk2/Makefile +++ b/src/modules/gtk2/Makefile @@ -71,9 +71,9 @@ clean: rm -f $(OBJS) $(ASM_OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/gtk2" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/gtk2" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/gtk2" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gtk2" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile index 0d1fee44..aedb7b5e 100644 --- a/src/modules/jackrack/Makefile +++ b/src/modules/jackrack/Makefile @@ -58,14 +58,14 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/jackrack" - install -m 644 $(YML_FILES) "$(DESTDIR)$(datadir)/mlt/jackrack" - [ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(datadir)/mlt/jackrack" || true + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/jackrack" + install -m 644 $(YML_FILES) "$(DESTDIR)$(mltdatadir)/jackrack" + [ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(mltdatadir)/jackrack" || true uninstall: - rm "$(DESTDIR)$(libdir)/mlt/libmltjackrack$(LIBSUF)" 2> /dev/null || true - rm -rf "$(DESTDIR)$(datadir)/mlt/jackrack" + rm "$(DESTDIR)$(moduledir)/libmltjackrack$(LIBSUF)" 2> /dev/null || true + rm -rf "$(DESTDIR)$(mltdatadir)/jackrack" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile index eecaa584..eabc4e76 100644 --- a/src/modules/kdenlive/Makefile +++ b/src/modules/kdenlive/Makefile @@ -32,9 +32,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/kdenlive" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/kdenlive" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/kdenlive" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/kdenlive" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile index 98483861..71b3b1a9 100644 --- a/src/modules/kino/Makefile +++ b/src/modules/kino/Makefile @@ -42,7 +42,7 @@ clean: rm -f $(OBJS) $(TARGET) $(CPPOBJS) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/linsys/Makefile b/src/modules/linsys/Makefile index 6dc3df4f..143cb9d6 100755 --- a/src/modules/linsys/Makefile +++ b/src/modules/linsys/Makefile @@ -32,9 +32,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/linsys" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/linsys" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/linsys" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/linsys" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile index 34b1c5ae..ed514822 100644 --- a/src/modules/lumas/Makefile +++ b/src/modules/lumas/Makefile @@ -17,7 +17,7 @@ clean: rm -f luma install: all - install -d $(DESTDIR)$(datadir)/mlt/lumas/PAL - install -d $(DESTDIR)$(datadir)/mlt/lumas/NTSC - install -m 644 PAL/* $(DESTDIR)$(datadir)/mlt/lumas/PAL - install -m 644 NTSC/* $(DESTDIR)$(datadir)/mlt/lumas/NTSC + install -d $(DESTDIR)$(mltdatadir)/lumas/PAL + install -d $(DESTDIR)$(mltdatadir)/lumas/NTSC + install -m 644 PAL/* $(DESTDIR)$(mltdatadir)/lumas/PAL + install -m 644 NTSC/* $(DESTDIR)$(mltdatadir)/lumas/NTSC diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile index 822868e2..0d142750 100644 --- a/src/modules/motion_est/Makefile +++ b/src/modules/motion_est/Makefile @@ -31,9 +31,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/motion_est" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/motion_est" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/motion_est" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/motion_est" test: $(TARGET) ~/mlt-devel/mlt/src/melt/melt -filter motion_est -filter vismv -filter benchmark -consumer sdl rescale=none real_time=0 audio_off=1 silent=1 /media/cdrecorder/BBC.The.Private.Life.Of.Plants.Pt5.Living.Together.DivX505.AC3.www.MVGroup.org.uk.avi in=50000 diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile index cc04b08c..5a4758a9 100644 --- a/src/modules/normalize/Makefile +++ b/src/modules/normalize/Makefile @@ -27,9 +27,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/normalize" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/normalize" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/normalize" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/normalize" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile index e7e200be..9b5e3b0b 100644 --- a/src/modules/oldfilm/Makefile +++ b/src/modules/oldfilm/Makefile @@ -31,10 +31,10 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d $(DESTDIR)$(datadir)/mlt/oldfilm - install -m 644 *.svg "$(DESTDIR)$(datadir)/mlt/oldfilm" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/oldfilm" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d $(DESTDIR)$(mltdatadir)/oldfilm + install -m 644 *.svg "$(DESTDIR)$(mltdatadir)/oldfilm" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/oldfilm" ifneq ($(wildcard .depend),) diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile index 6a796075..62019da8 100644 --- a/src/modules/plus/Makefile +++ b/src/modules/plus/Makefile @@ -30,9 +30,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/plus" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/plus" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/plus" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/plus" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile index 82f5d8dc..be5e1cc6 100644 --- a/src/modules/qimage/Makefile +++ b/src/modules/qimage/Makefile @@ -41,9 +41,9 @@ clean: rm -f $(OBJS) $(TARGET) $(CPPOBJS) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/qimage" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/qimage" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/qimage" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/qimage" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile index f2e81781..28545d51 100644 --- a/src/modules/resample/Makefile +++ b/src/modules/resample/Makefile @@ -30,9 +30,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/resample" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/resample" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/resample" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/resample" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/rotoscoping/Makefile b/src/modules/rotoscoping/Makefile index 782733ac..f3f2dec0 100644 --- a/src/modules/rotoscoping/Makefile +++ b/src/modules/rotoscoping/Makefile @@ -30,9 +30,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d $(DESTDIR)$(datadir)/mlt/rotoscoping - install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(datadir)/mlt/rotoscoping" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d $(DESTDIR)$(mltdatadir)/rotoscoping + install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(mltdatadir)/rotoscoping" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/rtaudio/Makefile b/src/modules/rtaudio/Makefile index d55c6c38..acada51f 100644 --- a/src/modules/rtaudio/Makefile +++ b/src/modules/rtaudio/Makefile @@ -48,13 +48,13 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - #install -d "$(DESTDIR)$(datadir)/mlt/rtaudio" - #install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/rtaudio" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + #install -d "$(DESTDIR)$(mltdatadir)/rtaudio" + #install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/rtaudio" uninstall: - rm "$(DESTDIR)$(libdir)/mlt/libmltrtaudio$(LIBSUF)" 2> /dev/null || true - rm -rf "$(DESTDIR)$(datadir)/mlt/rtaudio" + rm "$(DESTDIR)$(moduledir)/libmltrtaudio$(LIBSUF)" 2> /dev/null || true + rm -rf "$(DESTDIR)$(mltdatadir)/rtaudio" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile index 6fab5d41..e368730c 100644 --- a/src/modules/sdl/Makefile +++ b/src/modules/sdl/Makefile @@ -52,9 +52,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/sdl" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/sdl" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/sdl" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/sdl" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile index 19ba02d8..fda50a32 100644 --- a/src/modules/sox/Makefile +++ b/src/modules/sox/Makefile @@ -28,14 +28,14 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/sox" - install -m 644 filter_sox.yml "$(DESTDIR)$(datadir)/mlt/sox" - install -m 644 filter_sox_effect.yml "$(DESTDIR)$(datadir)/mlt/sox" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/sox" + install -m 644 filter_sox.yml "$(DESTDIR)$(mltdatadir)/sox" + install -m 644 filter_sox_effect.yml "$(DESTDIR)$(mltdatadir)/sox" uninstall: - rm "$(DESTDIR)$(libdir)/mlt/libmltsox$(LIBSUF)" 2> /dev/null || true - rm -rf "$(DESTDIR)$(datadir)/mlt/sox" + rm "$(DESTDIR)$(moduledir)/libmltsox$(LIBSUF)" 2> /dev/null || true + rm -rf "$(DESTDIR)$(mltdatadir)/sox" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/swfdec/Makefile b/src/modules/swfdec/Makefile index e6839e73..ae18e44d 100644 --- a/src/modules/swfdec/Makefile +++ b/src/modules/swfdec/Makefile @@ -30,9 +30,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/swfdec" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/swfdec" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/swfdec" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/swfdec" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/videostab/Makefile b/src/modules/videostab/Makefile index c6b45fd2..c9d6eedf 100644 --- a/src/modules/videostab/Makefile +++ b/src/modules/videostab/Makefile @@ -34,9 +34,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d $(DESTDIR)$(datadir)/mlt/videostab - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/videostab" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d $(DESTDIR)$(mltdatadir)/videostab + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/videostab" ifneq ($(wildcard .depend),) diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile index 27793e3d..2343ec94 100644 --- a/src/modules/vmfx/Makefile +++ b/src/modules/vmfx/Makefile @@ -30,9 +30,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/vmfx" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vmfx" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/vmfx" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vmfx" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile index 6c8cd6c6..399c3ae3 100644 --- a/src/modules/vorbis/Makefile +++ b/src/modules/vorbis/Makefile @@ -32,9 +32,9 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/vorbis" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vorbis" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/vorbis" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vorbis" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile index cebf3927..ed29e30e 100644 --- a/src/modules/xine/Makefile +++ b/src/modules/xine/Makefile @@ -33,7 +33,7 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" ifneq ($(wildcard .depend),) include .depend diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile index caa092c9..fafc540c 100644 --- a/src/modules/xml/Makefile +++ b/src/modules/xml/Makefile @@ -31,10 +31,10 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt" - install -d "$(DESTDIR)$(datadir)/mlt/xml" - install -m 644 mlt-xml.dtd "$(DESTDIR)$(datadir)/mlt/xml" - install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/xml" + install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" + install -d "$(DESTDIR)$(mltdatadir)/xml" + install -m 644 mlt-xml.dtd "$(DESTDIR)$(mltdatadir)/xml" + install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/xml" ifneq ($(wildcard .depend),) include .depend