GNOME.org
 

[rhythmbox] don't install static libraries for plugins or librhythmbox-core

commit bcfb567ce74690fc034976be056548762e715b2a
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri May 29 13:15:37 2009 +1000

    don't install static libraries for plugins or librhythmbox-core
    
    also don't install the sample vala plugin.
---
 corelib/Makefile.am                       |    1 +
 plugins/audiocd/Makefile.am               |    1 +
 plugins/audioscrobbler/Makefile.am        |    1 +
 plugins/brasero-disc-recorder/Makefile.am |    1 +
 plugins/cd-recorder/Makefile.am           |    1 +
 plugins/daap/Makefile.am                  |    1 +
 plugins/fmradio/Makefile.am               |    1 +
 plugins/generic-player/Makefile.am        |    1 +
 plugins/ipod/Makefile.am                  |    1 +
 plugins/iradio/Makefile.am                |    1 +
 plugins/lirc/Makefile.am                  |    1 +
 plugins/mmkeys/Makefile.am                |    1 +
 plugins/mtpdevice/Makefile.am             |    1 +
 plugins/power-manager/Makefile.am         |    1 +
 plugins/sample-vala/Makefile.am           |    9 +++++----
 plugins/status-icon/Makefile.am           |    1 +
 plugins/visualizer/Makefile.am            |    1 +
 17 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/corelib/Makefile.am b/corelib/Makefile.am
index 9e4db84..8ea61a5 100644
--- a/corelib/Makefile.am
+++ b/corelib/Makefile.am
@@ -14,4 +14,5 @@ librhythmbox_core_la_LIBADD = 				\
 	$(top_builddir)/lib/librb.la
 
 librhythmbox_core_la_LDFLAGS = -export-dynamic
+librhythmbox_core_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index fe2299d..37b2302 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -7,6 +7,7 @@ libaudiocd_la_SOURCES =					\
 	rb-audiocd-source.h
 
 libaudiocd_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libaudiocd_la_LIBTOOLFLAGS = --tag=disable-static
 
 libaudiocd_la_LIBADD = \
 	$(top_builddir)/corelib/librhythmbox-core.la	\
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index 04cab67..558f509 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -15,6 +15,7 @@ libaudioscrobbler_la_SOURCES = \
 	rb-lastfm-play-order.h
 
 libaudioscrobbler_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libaudioscrobbler_la_LIBTOOLFLAGS = --tag=disable-static
 libaudioscrobbler_la_LIBADD = 				\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
 	$(TOTEM_PLPARSER_LIBS)
diff --git a/plugins/brasero-disc-recorder/Makefile.am b/plugins/brasero-disc-recorder/Makefile.am
index eaf7e2d..16e404f 100644
--- a/plugins/brasero-disc-recorder/Makefile.am
+++ b/plugins/brasero-disc-recorder/Makefile.am
@@ -8,6 +8,7 @@ libcd_recorder_la_SOURCES =					\
 	$(NULL)
 
 libcd_recorder_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libcd_recorder_la_LIBTOOLFLAGS = --tag=disable-static
 libcd_recorder_la_LIBADD = 				\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
 	$(LIBBRASERO_MEDIA_LIBS)			\
diff --git a/plugins/cd-recorder/Makefile.am b/plugins/cd-recorder/Makefile.am
index e33922b..706b2ac 100644
--- a/plugins/cd-recorder/Makefile.am
+++ b/plugins/cd-recorder/Makefile.am
@@ -12,6 +12,7 @@ libcd_recorder_la_SOURCES =					\
 	$(NULL)
 
 libcd_recorder_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libcd_recorder_la_LIBTOOLFLAGS = --tag=disable-static
 libcd_recorder_la_LIBADD = 				\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
 	$(HAL_LIBS)					\
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 02f4a31..a446f99 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -31,6 +31,7 @@ libdaap_la_SOURCES = \
 	$(NULL)
 
 libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libdaap_la_LIBTOOLFLAGS = --tag=disable-static
 libdaap_la_LIBADD = 					\
 	$(DBUS_LIBS)					\
 	$(MDNS_LIBS)
diff --git a/plugins/fmradio/Makefile.am b/plugins/fmradio/Makefile.am
index 90a8b26..8ec8a12 100644
--- a/plugins/fmradio/Makefile.am
+++ b/plugins/fmradio/Makefile.am
@@ -11,6 +11,7 @@ libfmradio_la_SOURCES = \
   rb-radio-tuner-v4l2.c
 
 libfmradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libfmradio_la_LIBTOOLFLAGS = --tag=disable-static
 libfmradio_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
 
 INCLUDES = \
diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am
index 7a18ad2..113240d 100644
--- a/plugins/generic-player/Makefile.am
+++ b/plugins/generic-player/Makefile.am
@@ -16,6 +16,7 @@ libgeneric_player_la_SOURCES +=				\
 	rb-psp-source.h
 endif
 
+libgeneric_player_la_LIBTOOLFLAGS = --tag=disable-static
 libgeneric_player_la_LDFLAGS = 				\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(HAL_LIBS)				        \	
diff --git a/plugins/ipod/Makefile.am b/plugins/ipod/Makefile.am
index 1196427..77707c4 100644
--- a/plugins/ipod/Makefile.am
+++ b/plugins/ipod/Makefile.am
@@ -13,6 +13,7 @@ libipod_la_SOURCES = \
 	rb-ipod-plugin.c
 
 libipod_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libipod_la_LIBTOOLFLAGS = --tag=disable-static
 libipod_la_LIBADD = 					\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
 	$(HAL_LIBS)					\
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
index f7540e7..2fc6399 100644
--- a/plugins/iradio/Makefile.am
+++ b/plugins/iradio/Makefile.am
@@ -13,6 +13,7 @@ libiradio_la_SOURCES = 					\
 	rb-station-properties-dialog.h
 
 libiradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libiradio_la_LIBTOOLFLAGS = --tag=disable-static
 libiradio_la_LIBADD = 					\
 	$(top_builddir)/corelib/librhythmbox-core.la
 
diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am
index 0514813..2c85a4a 100644
--- a/plugins/lirc/Makefile.am
+++ b/plugins/lirc/Makefile.am
@@ -5,6 +5,7 @@ librblirc_la_SOURCES = \
 	rb-lirc-plugin.c
 
 librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client
+librblirc_la_LIBTOOLFLAGS = --tag=disable-static
 
 configdir = $(PLUGINDIR)/rblirc
 config_DATA = rhythmbox_lirc_default
diff --git a/plugins/mmkeys/Makefile.am b/plugins/mmkeys/Makefile.am
index 4acc9b2..5c717e6 100644
--- a/plugins/mmkeys/Makefile.am
+++ b/plugins/mmkeys/Makefile.am
@@ -8,6 +8,7 @@ libmmkeys_la_SOURCES = \
 	$(NULL)
 
 libmmkeys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libmmkeys_la_LIBTOOLFLAGS = --tag=disable-static
 
 libmmkeys_la_LIBADD =					\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am
index 7ccbbbd..57188a0 100644
--- a/plugins/mtpdevice/Makefile.am
+++ b/plugins/mtpdevice/Makefile.am
@@ -9,6 +9,7 @@ libmtpdevice_la_SOURCES = \
 	rb-mtp-source.h
 	
 libmtpdevice_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libmtpdevice_la_LIBTOOLFLAGS = --tag=disable-static
 libmtpdevice_la_LIBADD = 					\
 	$(top_builddir)/lib/librb.la			\
 	$(HAL_LIBS)					\
diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am
index 172e99d..8dbba4f 100644
--- a/plugins/power-manager/Makefile.am
+++ b/plugins/power-manager/Makefile.am
@@ -5,6 +5,7 @@ libpower_manager_la_SOURCES = \
 	rb-power-manager-plugin.c
 
 libpower_manager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static
 
 INCLUDES = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/plugins/sample-vala/Makefile.am b/plugins/sample-vala/Makefile.am
index 261e6f4..ab94d4d 100644
--- a/plugins/sample-vala/Makefile.am
+++ b/plugins/sample-vala/Makefile.am
@@ -1,6 +1,6 @@
-plugindir = $(PLUGINDIR)
-plugin_LTLIBRARIES = libsample-vala.la
-#noinst_LTLIBRARIES = libsample-vala.la
+plugindir = $(PLUGINDIR)/sample-vala
+#plugin_LTLIBRARIES = libsample-vala.la
+noinst_LTLIBRARIES = libsample-vala.la
 
 nodist_libsample_vala_la_SOURCES = \
 	rb-sample-vala-plugin.c				\
@@ -10,6 +10,7 @@ libsample_vala_la_SOURCES = \
 	rb-sample-vala-plugin.vala
 	
 libsample_vala_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libsample_vala_la_LIBTOOLFLAGS = --tag=disable-static
 
 libsample_vala_la_CFLAGS = $(WNOERROR_CFLAGS)
 
@@ -41,7 +42,7 @@ plugin_in_files = sample-vala.rb-plugin.in
 %.c %.h: %.vala
 	$(VALAC) -C --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb $^
 	
-plugin_DATA = $(plugin_in_files:.rb-plugin.in=.rb-plugin)
+# plugin_DATA = $(plugin_in_files:.rb-plugin.in=.rb-plugin)
 
 EXTRA_DIST = $(plugin_in_files)
 
diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am
index cc70896..a52c3ce 100644
--- a/plugins/status-icon/Makefile.am
+++ b/plugins/status-icon/Makefile.am
@@ -23,6 +23,7 @@ libstatus_icon_la_SOURCES = \
 
 
 libstatus_icon_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static
 
 libstatus_icon_la_LIBADD = $(RHYTHMBOX_LIBS)
 
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 7c8c73b..ffd3d33 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -9,6 +9,7 @@ libvisualizer_la_SOURCES = \
 	rb-vis-widget.h
 
 libvisualizer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
 
 libvisualizer_la_LIBADD = 				\
 	-lgstinterfaces-0.10				\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]