# HG changeset patch
# User Andrew O. Shadoura <bugzilla@tut.by>
# Date 1218051207 -10800
# Node ID b87f8c707b7f46637c8144d4e919faa165dd3634
# Parent  74134c731db6e3d3b7b7c8b5e58d53e4d255b0cd# Parent  b86e9f9663f4d674d02a7ead9e6c9951895c616a
branch merge

diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/Makefile
--- a/src/audacious/Makefile	Wed Jul 30 23:04:32 2008 +0100
+++ b/src/audacious/Makefile	Wed Aug 06 22:33:27 2008 +0300
@@ -150,8 +150,7 @@
        ui/carbon-menubar.ui
 
 CLEAN = build_stamp.c libaudacious.exe.a
-EXT_DEPS = ../libguess/libguess.a \
-           ../libSAD/libSAD.a
+EXT_DEPS = ../libguess/libguess.a ../libSAD/libSAD.so
 
 ifeq ($(USE_EGGSM),yes)
 EXT_DEPS += ../libeggsmclient/libeggsmclient.a
@@ -192,7 +191,7 @@
 		${LIBINTL}						\
 		${SAMPLERATE_LIBS}				\
 		../libguess/libguess.a			\
-		../libSAD/libSAD.a				\
+		-L../libSAD -lSAD			\
 		${EGGSM_LIBS}					\
 		${GLIB_LIBS}					\
 		${GTHREAD_LIBS}					\
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_about.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_albumart.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_credits.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_credits.h
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_fileinfo.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_fileinfo.h
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_jumptotrack.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_jumptotrack.h
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_jumptotrack_cache.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_jumptotrack_cache.h
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_urlopener.c
diff -r b86e9f9663f4 -r b87f8c707b7f src/audacious/ui_urlopener.h
diff -r b86e9f9663f4 -r b87f8c707b7f src/libSAD/Makefile
--- a/src/libSAD/Makefile	Wed Jul 30 23:04:32 2008 +0100
+++ b/src/libSAD/Makefile	Wed Aug 06 22:33:27 2008 +0300
@@ -1,4 +1,7 @@
-STATIC_LIB_NOINST = libSAD.a
+LIB = ${LIB_PREFIX}SAD${LIB_SUFFIX}
+LIB_MAJOR = 1
+LIB_MINOR = 0
+
 SRCS = dither.c \
        dither_ops.c \
        noicegen.c