Mercurial > audlegacy

changeset 4751:b87f8c707b7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch merge
author Andrew O. Shadoura <bugzilla@tut.by>
date Wed, 06 Aug 2008 22:33:27 +0300
parents 74134c731db6 (diff) b86e9f9663f4 (current diff)
children 22b7212eb3f9
files src/audacious/Makefile src/audacious/ui_about.c src/audacious/ui_albumart.c src/audacious/ui_credits.c src/audacious/ui_credits.h src/audacious/ui_dock.c src/audacious/ui_dock.h src/audacious/ui_equalizer.c src/audacious/ui_equalizer.h src/audacious/ui_fileinfo.c src/audacious/ui_fileinfo.h src/audacious/ui_hints.c src/audacious/ui_hints.h src/audacious/ui_jumptotrack.c src/audacious/ui_jumptotrack.h src/audacious/ui_jumptotrack_cache.c src/audacious/ui_jumptotrack_cache.h src/audacious/ui_main.c src/audacious/ui_main.h src/audacious/ui_main_evlisteners.c src/audacious/ui_main_evlisteners.h src/audacious/ui_manager.c src/audacious/ui_manager.h src/audacious/ui_playlist.c src/audacious/ui_playlist.h src/audacious/ui_playlist_evlisteners.c src/audacious/ui_playlist_evlisteners.h src/audacious/ui_playlist_manager.c src/audacious/ui_playlist_manager.h src/audacious/ui_skin.c src/audacious/ui_skin.h src/audacious/ui_skinned_button.c src/audacious/ui_skinned_button.h src/audacious/ui_skinned_equalizer_graph.c src/audacious/ui_skinned_equalizer_graph.h src/audacious/ui_skinned_equalizer_slider.c src/audacious/ui_skinned_equalizer_slider.h src/audacious/ui_skinned_horizontal_slider.c src/audacious/ui_skinned_horizontal_slider.h src/audacious/ui_skinned_menurow.c src/audacious/ui_skinned_menurow.h src/audacious/ui_skinned_monostereo.c src/audacious/ui_skinned_monostereo.h src/audacious/ui_skinned_number.c src/audacious/ui_skinned_number.h src/audacious/ui_skinned_playlist.c src/audacious/ui_skinned_playlist.h src/audacious/ui_skinned_playlist_slider.c src/audacious/ui_skinned_playlist_slider.h src/audacious/ui_skinned_playstatus.c src/audacious/ui_skinned_playstatus.h src/audacious/ui_skinned_textbox.c src/audacious/ui_skinned_textbox.h src/audacious/ui_skinned_window.c src/audacious/ui_skinned_window.h src/audacious/ui_skinselector.c src/audacious/ui_skinselector.h src/audacious/ui_svis.c src/audacious/ui_svis.h src/audacious/ui_urlopener.c src/audacious/ui_urlopener.h src/audacious/ui_vis.c src/audacious/ui_vis.h
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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}					\
--- 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