+ Final updates for 0.2.1 - distclean corrected, soname usage in linking, version...

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@874 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/Makefile b/Makefile
index 3723d72781fa12f1aaf84fc386e6a1f9c9ff0a46..e4d80600c52371e46cfd6c6624127641cb9fba13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all clean:
                $(MAKE) -C $$subdir $@ || exit 1; \
        done
 
-dist-clean:
+distclean:
        rm mlt-config packages.dat; \
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \

diff --git a/configure b/configure
index 55aeac6ee8f799f3b27a519d5330b2713a27f9e6..47ddfdb55fafde03884478d5f308a700d507df6a 100755 (executable)
--- a/configure
+++ b/configure
@@ -113,7 +113,7 @@ export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
 export help=0
-export version=0.1.1
+export version=0.2.1
 export debug=true
 export mmx=true
 export gpl=false

diff --git a/src/albino/Makefile b/src/albino/Makefile
index e527ef1da7a551840fdf9710011464bd8f3de9dd..ea54d974859791274109db53c0bab2ecd3b412ea 100644 (file)
--- a/src/albino/Makefile
+++ b/src/albino/Makefile
@@ -18,7 +18,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/framework/Makefile b/src/framework/Makefile
index bc6fdcfc5b851fbaccccc226d8333fe008de9954..9c24a582b509d29f69fe07cf93145264a66caa7c 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -1,6 +1,7 @@
 include ../../config.mak
 
-TARGET = libmlt$(LIBSUF)
+NAME = libmlt$(LIBSUF)
+TARGET = $(NAME).$(version)
 
 OBJS = mlt_frame.o \
           mlt_geometry.o \
@@ -50,25 +51,27 @@ SRCS := $(OBJS:.o=.c)
 
 CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\""
 
-LDFLAGS += -lm $(LIBDL) -lpthread
+LDFLAGS += -Wl,-soname,libmlt.so.$(version) -lm $(LIBDL) -lpthread
 
 all:   $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+               ln -sf $(TARGET) $(NAME)
 
 depend:        $(SRCS)
-               $(CC) -MM $(CFLAGS) $^ 1>.depend
+       $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 
-               rm -f $(OBJS) $(TARGET)
+               rm -f $(OBJS) $(TARGET) $(NAME)
 
 install:
        install -d $(DESTDIR)$(libdir)
-       install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt$(LIBSUF)
+       install -m 755 $(TARGET) $(DESTDIR)$(libdir)
+       ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
 

diff --git a/src/humperdink/Makefile b/src/humperdink/Makefile
index c27adaea4ab3bb266f23dee0a16f0062262b158a..266f6c104896a3357c80b37832598ee4c9de1da3 100644 (file)
--- a/src/humperdink/Makefile
+++ b/src/humperdink/Makefile
@@ -20,7 +20,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/inigo/Makefile b/src/inigo/Makefile
index 02439ca5ff487f1401242d58545c9698dc300e04..d5e90c74025081449465625594e0cb8f2048c8db 100644 (file)
--- a/src/inigo/Makefile
+++ b/src/inigo/Makefile
@@ -19,7 +19,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/miracle/Makefile b/src/miracle/Makefile
index 0329affb87258014b87b6f54a5f77e3fcc7a4afd..691142d2885f3183f9495b9b638f59fe1a6f89ce 100644 (file)
--- a/src/miracle/Makefile
+++ b/src/miracle/Makefile
@@ -1,6 +1,8 @@
 include ../../config.mak
 
 TARGET = miracle
+LIBNAME = libmiracle$(LIBSUF)
+LIBTARGET = $(LIBNAME).$(version)
 
 APP_OBJS = miracle.o
 
@@ -26,25 +28,27 @@ SRCS := $(OBJS:.o=.c)
 
 all:           $(TARGET)
 
-$(TARGET):     $(APP_OBJS) libmiracle$(LIBSUF)
+$(TARGET):     $(APP_OBJS) $(LIBTARGET)
                        $(CC) -o $@ $(APP_OBJS) -L. -lmiracle $(LDFLAGS)
 
-libmiracle$(LIBSUF):   $(LIB_OBJS)
-                       $(CC) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS)
+$(LIBTARGET):  $(LIB_OBJS)
+                       $(CC) -Wl,-soname,$(LIBTARGET) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS)
+                       ln -sf $(LIBTARGET) $(LIBNAME)
 
 depend:                $(SRCS)
                        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                        rm -f .depend
 
 clean: 
-                       rm -f $(OBJS) $(TARGET) libmiracle$(LIBSUF)
+                       rm -f $(OBJS) $(TARGET) $(LIBNAME) $(LIBTARGET)
 
 install:       all
        install -d "$(DESTDIR)$(bindir)"
        install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
-       install -m 755 libmiracle$(LIBSUF) $(DESTDIR)$(libdir)/libmiracle$(LIBSUF)
+       install -m 755 $(LIBTARGET) $(DESTDIR)$(libdir)
+       ln -sf $(LIBTARGET) $(DESTDIR)$(libdir)/$(LIBNAME)
        mkdir -p "$(DESTDIR)$(prefix)/include/mlt/miracle"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/miracle"
 

diff --git a/src/modules/Makefile b/src/modules/Makefile
index e93ade0242f7889da363c0f8bad7c6503d7a7aa9..b5c4eaa818b75a43190ed2157f598a61eafdd415 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -10,7 +10,7 @@ all clean depend:
                fi \
        done
 
-dist-clean:
+distclean:
        rm -f consumers.dat filters.dat producers.dat transitions.dat make.inc; \
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 51adb42d1c9609c5d9ca3813070ec2913844dc39..b9e801adf188eba217a2a3a25a7cbccf34cc0987 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -36,8 +36,8 @@ depend:       $(SRCS)
                if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dist-clean ; fi
+distclean:     clean
+               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
                rm -f .depend
 
 clean: 

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 0c1b49afe095bbc55d643d7cbd30b48a237bb8f3..1842a82873ba76fa559f5d389baf4587695f67a9 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -45,7 +45,7 @@ composite_line_yuv_mmx.o: composite_line_yuv_mmx.S
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 39abd766ac2dd7310972a5d148be8974c722c299..4ec79aeb010bdbac2a87717fcd8dffe08fcd5f08 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -22,7 +22,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index c557a6ae71aaf9a63e80e0e805cffa1137e34afd..ce76aaa48eb98733b606d4795a11525caa14021e 100644 (file)
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -4,7 +4,7 @@ all:
 
 depend:
 
-dist-clean:
+distclean:
 
 clean:
 

diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
index 6102e36e96d8caa6bf453e5b634e96cdad6dfa67..362e160691e0da376e37fe604b71f079a75caade 100644 (file)
--- a/src/modules/fezzik/Makefile
+++ b/src/modules/fezzik/Makefile
@@ -20,7 +20,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 87465def1452ca69b38f5a2449bcc5e0c3a1ae1e..d2011ac0caa8aa43e7c7ea991b7344e45b73013b 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -46,7 +46,7 @@ scale_line_22_yuv_mmx.o: scale_line_22_yuv_mmx.S
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile
index 1c56f4b7ea9aee87dea3f5cc2c45285e1239f9af..2318559805761c5fb2973ceb408ca7da037b351d 100644 (file)
--- a/src/modules/inigo/Makefile
+++ b/src/modules/inigo/Makefile
@@ -19,7 +19,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 294643ae9954589f4e1510e1ed238dfeac3696d9..7c821b3f22c7570e5735e62fb641e6b9a7842fa3 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -33,7 +33,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index cfbb6a051e34da2bf5b83c94ff88619a581744ee..e6f780bf6af763dbc949658e91302c0d55bace8a 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -31,7 +31,7 @@ $(TARGET): $(OBJS) $(CPPOBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend config.h config.mak
 
 clean: 

diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index 8d663ef86c1e38669a95b45131695f545d5a6d82..caec1869ebdd455ffe008c3d9bd6dc080fd7f314 100644 (file)
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -10,7 +10,7 @@ create_lumas:
 
 depend:
 
-dist-clean:
+distclean:
        rm -rf PAL NTSC luma 
 
 clean:

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index bd0c57a4bd4202593bd3ffa14e9ec3aef59fd937..83048d93d6ec2e6e90bffe391dbd96061d815394 100644 (file)
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -24,7 +24,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index 42e11138be9858da8a71f6e1e73bccd3f6c410b2..eaec6eca11c52f34da21cec9d6343c2ee9c9a3f7 100644 (file)
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -19,7 +19,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 2577d6630330906e28b2264e70890f3f041d1be2..b2bc473f1e444061c01e8991109b867da0bc7951 100644 (file)
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -23,7 +23,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index 14d94cd3f12f59166c41b5024310d2f100fa5ec6..c4cc9cb771b4d52bb2a3ad273236993f1d55bc83 100644 (file)
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -21,7 +21,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 6058a15e93a6ae75d5d346a3df21676f616a9e27..838352808ad9c515edfaee17a726a742ac922050 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -36,7 +36,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 33e9865211a0746d8146a8e30f72dbb25665d84e..7b6c2ab8c0f65b62056558a97bfc2d35692c6a8a 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -19,7 +19,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/valerie/Makefile b/src/modules/valerie/Makefile
index b450cb3142c3d6283f64edca2433a891d27d8f7c..2e3c43982362167e9549471bef865bd264be1568 100644 (file)
--- a/src/modules/valerie/Makefile
+++ b/src/modules/valerie/Makefile
@@ -19,7 +19,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index 75bb76dffcf0201feaa49b0cbfc8919584e04352..afb164fcb36525aa352b6b327b5ddd1eafb831d8 100644 (file)
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -22,7 +22,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index 6720b313aa152c75d9f5c8a9e5ffdd2f0744d971..57faeadc59e2170f3956f2ea953fbde92bb6f858 100644 (file)
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -21,7 +21,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile
index 9ba06bc00448808540b22892eb57b3d79b58d574..37c490b4bbdc59afbd84d88d36cfcb408f7f095f 100644 (file)
--- a/src/modules/westley/Makefile
+++ b/src/modules/westley/Makefile
@@ -22,7 +22,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index 08978c8570b8e5f51e9025da1f56bda5e58a882f..82494332bb2f3b99fae9371c91eecdf0913117a2 100644 (file)
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -21,7 +21,7 @@ $(TARGET): $(OBJS)
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 

diff --git a/src/valerie/Makefile b/src/valerie/Makefile
index 64c2fc11009349f258b26b29720a546e17a44404..d7417434a22db3408a8e900bae31e462453d32bb 100644 (file)
--- a/src/valerie/Makefile
+++ b/src/valerie/Makefile
@@ -1,6 +1,7 @@
 include ../../config.mak
 
-TARGET = libvalerie$(LIBSUF)
+NAME = libvalerie$(LIBSUF)
+TARGET = libvalerie$(LIBSUF).$(version)
 
 OBJS = valerie.o \
           valerie_notifier.o \
@@ -25,24 +26,26 @@ INCS = valerie.h \
 SRCS := $(OBJS:.o=.c)
 
 CFLAGS += -I.. $(RDYNAMIC)
-LDFLAGS += -L../framework -lmlt -lpthread
+LDFLAGS += -Wl,-soname,$(TARGET) -L../framework -lmlt -lpthread
 
 all: $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+               ln -sf $(TARGET) $(NAME)
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
+distclean:     clean
                rm -f .depend
 
 clean: 
-               rm -f $(OBJS) $(TARGET)
+               rm -f $(OBJS) $(TARGET) $(NAME)
 
 install:       all
-       install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libvalerie$(LIBSUF)
+       install -m 755 $(TARGET) $(DESTDIR)$(libdir)
+       ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
        mkdir -p "$(DESTDIR)$(prefix)/include/mlt/valerie"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/valerie"