gnome-media r4243 - in trunk: . gnome-volume-control gnome-volume-control/src gst-mixer/src sound-theme

[hadess svn gnome org]

Author: hadess
Date: Wed Mar  4 22:28:56 2009
New Revision: 4243
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4243&view=rev

Log:
2009-03-04  Bastien Nocera  <hadess hadess net>

	* gst-mixer/src/Makefile.am:
	* sound-theme/Makefile.am: Use properly linked libtool libs,
	not static libs

2009-03-04  Bastien Nocera  <hadess hadess net>

	* src/Makefile.am: Link to libsoundtheme.la, not using
	-l against a static lib



Modified:
   trunk/ChangeLog
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/Makefile.am
   trunk/gst-mixer/src/Makefile.am
   trunk/sound-theme/Makefile.am

Modified: trunk/gnome-volume-control/src/Makefile.am
==============================================================================
--- trunk/gnome-volume-control/src/Makefile.am	(original)
+++ trunk/gnome-volume-control/src/Makefile.am	Wed Mar  4 22:28:56 2009
@@ -7,7 +7,7 @@
 
 AM_CPPFLAGS =					\
 	$(WARN_CFLAGS)				\
-	-I../../sound-theme			\
+	-I$(top_srcdir)/sound-theme		\
 	$(VOLUME_CONTROL_CFLAGS)		\
 	$(PULSEAUDIO_CFLAGS)			\
 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
@@ -47,11 +47,10 @@
 	applet-main.c				\
 	$(NULL)
 
-gnome_volume_control_LDADD =			\
-	-L$(top_builddir)/sound-theme		\
-	-lsoundtheme				\
-	$(VOLUME_CONTROL_LIBS)			\
-	$(PULSEAUDIO_LIBS)			\
+gnome_volume_control_LDADD =				\
+	$(VOLUME_CONTROL_LIBS)				\
+	$(PULSEAUDIO_LIBS)				\
+	$(top_builddir)/sound-theme/libsoundtheme.la	\
 	$(NULL)
 
 gnome_volume_control_SOURCES =			\

Modified: trunk/gst-mixer/src/Makefile.am
==============================================================================
--- trunk/gst-mixer/src/Makefile.am	(original)
+++ trunk/gst-mixer/src/Makefile.am	Wed Mar  4 22:28:56 2009
@@ -1,8 +1,7 @@
 
 if HAVE_SOUND_THEME
 GVC_ST_LIBS = $(SOUND_THEME_LIBS) \
-	 -L$(top_builddir)/sound-theme \
-	 -lsoundtheme
+	$(top_builddir)/sound-theme/libsoundtheme.la
 endif
 
 AM_CPPFLAGS = \

Modified: trunk/sound-theme/Makefile.am
==============================================================================
--- trunk/sound-theme/Makefile.am	(original)
+++ trunk/sound-theme/Makefile.am	Wed Mar  4 22:28:56 2009
@@ -2,7 +2,7 @@
 
 SUBDIRS = sounds
 
-noinst_LIBRARIES = libsoundtheme.a
+noinst_LTLIBRARIES = libsoundtheme.la
 
 AM_CPPFLAGS =						\
         $(WARN_CFLAGS)					\
@@ -11,13 +11,16 @@
         -DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\""	\
         $(NULL)
 
-libsoundtheme_a_SOURCES = \
+libsoundtheme_la_SOURCES = \
 	gvc-sound-theme-chooser.h		\
 	gvc-sound-theme-chooser.c		\
 	sound-theme-file-utils.h		\
 	sound-theme-file-utils.c		\
 	$(NULL)
 
+libsoundtheme_la_LIBADD = $(SOUND_THEME_LIBS)
+libsoundtheme_la_LDFLAGS = -no-undefined
+
 BUILT_SOURCES =				\
 	$(NULL)