From: lilo_booter Date: Mon, 5 Dec 2005 11:35:55 +0000 (+0000) Subject: + Final updates for 0.2.1 - distclean corrected, soname usage in linking, version... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=30bf05a2dc3d17d9cf87300e07e66828fd729c17;p=mlt + Final updates for 0.2.1 - distclean corrected, soname usage in linking, version bump 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 3723d727..e4d80600 100644 --- 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 55aeac6e..47ddfdb5 100755 --- 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 e527ef1d..ea54d974 100644 --- 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 bc6fdcfc..9c24a582 100644 --- 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 c27adaea..266f6c10 100644 --- 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 02439ca5..d5e90c74 100644 --- 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 0329affb..691142d2 100644 --- 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 e93ade02..b5c4eaa8 100644 --- 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 51adb42d..b9e801ad 100644 --- 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 0c1b49af..1842a828 100644 --- 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 39abd766..4ec79aeb 100644 --- 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 c557a6ae..ce76aaa4 100644 --- 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 6102e36e..362e1606 100644 --- 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 87465def..d2011ac0 100644 --- 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 1c56f4b7..23185598 100644 --- 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 294643ae..7c821b3f 100644 --- 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 cfbb6a05..e6f780bf 100644 --- 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 8d663ef8..caec1869 100644 --- 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 bd0c57a4..83048d93 100644 --- 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 42e11138..eaec6eca 100644 --- 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 2577d663..b2bc473f 100644 --- 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 14d94cd3..c4cc9cb7 100644 --- 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 6058a15e..83835280 100644 --- 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 33e98652..7b6c2ab8 100644 --- 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 b450cb31..2e3c4398 100644 --- 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 75bb76df..afb164fc 100644 --- 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 6720b313..57faeadc 100644 --- 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 9ba06bc0..37c490b4 100644 --- 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 08978c85..82494332 100644 --- 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 64c2fc11..d7417434 100644 --- 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"