[patch] brasero-2.32.0-build-plugins-against-local-library.patch

brasero-2.32.0-build-plugins-against-local-library.patch (text/plain), 15.18 KB, created by Mike Auty (RETIRED) on 2010-10-12 21:46:03 UTC

diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
index 3076101..b3d90af 100644
--- a/nautilus/Makefile.am
+++ b/nautilus/Makefile.am
@@ -49,10 +49,10 @@ libnautilus_brasero_extension_la_SOURCES = 	\
 	$(top_srcdir)/src/brasero-drive-settings.c
 
 libnautilus_brasero_extension_la_LIBADD =	\
-	$(NAUTILUS_EXTENSION_LIBS)		\
 	../libbrasero-utils/libbrasero-utils@BRASERO_LIBRARY_SUFFIX@.la	\
 	../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la	\
-	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la	\
+	$(NAUTILUS_EXTENSION_LIBS)		
 	
 libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
 
diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
index abed438..cd46238 100644
--- a/plugins/audio2cue/Makefile.am
+++ b/plugins/audio2cue/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 audio2cuedir = $(BRASERO_PLUGIN_DIRECTORY)
 audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
 libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
-libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_audio2cue_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_audio2cue_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/cdrdao/Makefile.am b/plugins/cdrdao/Makefile.am
index 0cf0c51..06817b6 100644
--- a/plugins/cdrdao/Makefile.am
+++ b/plugins/cdrdao/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 cdrdaodir = $(BRASERO_PLUGIN_DIRECTORY)
 cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
 libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c 
-libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_cdrdao_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
index 9900c6d..d15caf3 100644
--- a/plugins/cdrkit/Makefile.am
+++ b/plugins/cdrkit/Makefile.am
@@ -19,7 +19,7 @@ wodimdir = $(BRASERO_PLUGIN_DIRECTORY)
 wodim_LTLIBRARIES = libbrasero-wodim.la
 libbrasero_wodim_la_SOURCES = burn-wodim.c \
 	burn-cdrkit.h 
-libbrasero_wodim_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_wodim_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_wodim_la_LDFLAGS = -module -avoid-version
 
 #genisoimage
@@ -27,7 +27,7 @@ genisoimagedir = $(BRASERO_PLUGIN_DIRECTORY)
 genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
 libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
 	burn-cdrkit.h 
-libbrasero_genisoimage_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_genisoimage_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
 
 #readom
@@ -35,7 +35,7 @@ readomdir = $(BRASERO_PLUGIN_DIRECTORY)
 readom_LTLIBRARIES = libbrasero-readom.la
 libbrasero_readom_la_SOURCES = burn-readom.c \
 	burn-cdrkit.h 
-libbrasero_readom_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_readom_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_readom_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
index c70d497..69da3da 100644
--- a/plugins/cdrtools/Makefile.am
+++ b/plugins/cdrtools/Makefile.am
@@ -19,7 +19,7 @@ cdrecorddir = $(BRASERO_PLUGIN_DIRECTORY)
 cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
 libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
 	burn-cdrtools.h 
-libbrasero_cdrecord_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_cdrecord_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
 
 #mkisofs
@@ -27,7 +27,7 @@ mkisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
 mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
 libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
 	burn-cdrtools.h 
-libbrasero_mkisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_mkisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
 
 #readcd
@@ -35,14 +35,14 @@ readcddir = $(BRASERO_PLUGIN_DIRECTORY)
 readcd_LTLIBRARIES = libbrasero-readcd.la
 libbrasero_readcd_la_SOURCES = burn-readcd.c \
 	burn-cdrtools.h 
-libbrasero_readcd_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_readcd_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_readcd_la_LDFLAGS = -module -avoid-version
 
 #cdda2wav
 cdda2wavdir = $(BRASERO_PLUGIN_DIRECTORY)
 cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
 libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h 
-libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_cdda2wav_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_cdda2wav_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
index f7069bf..0edf711 100644
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -20,7 +20,7 @@ checksum_LTLIBRARIES = libbrasero-checksum.la
 libbrasero_checksum_la_SOURCES = burn-checksum-image.c	
 
 libbrasero_checksum_la_LDFLAGS = -module -avoid-version
-libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_checksum_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 
 checksumfiledir = $(BRASERO_PLUGIN_DIRECTORY)
 checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
@@ -29,6 +29,6 @@ libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
 				      burn-volume-read.h
 
 libbrasero_checksum_file_la_LDFLAGS = -module -avoid-version
-libbrasero_checksum_file_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_checksum_file_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
index 9bbc9ce..4b9b06f 100644
--- a/plugins/dvdauthor/Makefile.am
+++ b/plugins/dvdauthor/Makefile.am
@@ -19,7 +19,7 @@ dvdauthordir = $(BRASERO_PLUGIN_DIRECTORY)
 dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
 
 libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
-libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_dvdauthor_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
 libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
 
 
diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
index 19dc213..506b8ac 100644
--- a/plugins/dvdcss/Makefile.am
+++ b/plugins/dvdcss/Makefile.am
@@ -17,7 +17,7 @@ plugindir = $(BRASERO_PLUGIN_DIRECTORY)
 plugin_LTLIBRARIES = libbrasero-dvdcss.la
 libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c \
 	burn-dvdcss-private.h 
-libbrasero_dvdcss_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_dvdcss_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS)
 libbrasero_dvdcss_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
index cee046b..a220f31 100644
--- a/plugins/growisofs/Makefile.am
+++ b/plugins/growisofs/Makefile.am
@@ -19,14 +19,14 @@ growisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
 growisofs_LTLIBRARIES = libbrasero-growisofs.la
 libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
 	burn-growisofs-common.h 
-libbrasero_growisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_growisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
 
 #dvdrwformat
 dvdrwformatdir = $(BRASERO_PLUGIN_DIRECTORY)
 dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
 libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
-libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_dvdrwformat_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
 libbrasero_dvdrwformat_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/libburnia/Makefile.am b/plugins/libburnia/Makefile.am
index 379501a..53e5df4 100644
--- a/plugins/libburnia/Makefile.am
+++ b/plugins/libburnia/Makefile.am
@@ -23,7 +23,7 @@ libbrasero_libburn_la_SOURCES = burn-libburn.c 		\
 				burn-libburn-common.c	\
 				burn-libburn-common.h  \
 				burn-libburnia.h 
-libbrasero_libburn_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_libburn_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
 libbrasero_libburn_la_LDFLAGS = -module -avoid-version
 
 #libisofs (apparently libisofs needs one libburn function)
@@ -32,7 +32,7 @@ libisofs_LTLIBRARIES = libbrasero-libisofs.la
 libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
 	burn-libburn-common.c burn-libburn-common.h			\
 	burn-libburnia.h 
-libbrasero_libisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_libisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
 libbrasero_libisofs_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/local-track/Makefile.am b/plugins/local-track/Makefile.am
index 0991bfe..f13214c 100644
--- a/plugins/local-track/Makefile.am
+++ b/plugins/local-track/Makefile.am
@@ -20,7 +20,7 @@ local_trackdir = $(BRASERO_PLUGIN_DIRECTORY)
 local_track_LTLIBRARIES = libbrasero-local-track.la
 
 libbrasero_local_track_la_SOURCES = burn-local-image.c 
-libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_local_track_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
 libbrasero_local_track_la_LDFLAGS = -module -avoid-version
 
 #burn-uri
@@ -28,7 +28,7 @@ burn_uridir = $(BRASERO_PLUGIN_DIRECTORY)
 burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
 
 libbrasero_burn_uri_la_SOURCES = burn-uri.c 
-libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_burn_uri_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
 libbrasero_burn_uri_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/transcode/Makefile.am b/plugins/transcode/Makefile.am
index 3a029e0..2a7eb1b 100644
--- a/plugins/transcode/Makefile.am
+++ b/plugins/transcode/Makefile.am
@@ -19,21 +19,21 @@ transcodedir = $(BRASERO_PLUGIN_DIRECTORY)
 transcode_LTLIBRARIES = libbrasero-transcode.la
 
 libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
-libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_transcode_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
 libbrasero_transcode_la_LDFLAGS = -module -avoid-version
 
 normalizedir = $(BRASERO_PLUGIN_DIRECTORY)
 normalize_LTLIBRARIES = libbrasero-normalize.la
 
 libbrasero_normalize_la_SOURCES = burn-normalize.c burn-normalize.h
-libbrasero_normalize_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_normalize_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
 libbrasero_normalize_la_LDFLAGS = -module -avoid-version
 
 vobdir = $(BRASERO_PLUGIN_DIRECTORY)
 vob_LTLIBRARIES = libbrasero-vob.la
 
 libbrasero_vob_la_SOURCES = burn-vob.c 
-libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_vob_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
 libbrasero_vob_la_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/vcdimager/Makefile.am b/plugins/vcdimager/Makefile.am
index d11a077..27fcab3 100644
--- a/plugins/vcdimager/Makefile.am
+++ b/plugins/vcdimager/Makefile.am
@@ -19,7 +19,7 @@ vcdimagerdir = $(BRASERO_PLUGIN_DIRECTORY)
 vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
 
 libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
-libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
+libbrasero_vcdimager_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
 libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version