GNOME.org
 

[brasero] Allow to build with gtk2 and gtk3 Note that with gtk2 nautilus-extension will not be built as nautil

commit c65485ccfd2be8216161cb3ed5897c0b3d17d39c
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Fri Jul 9 09:36:08 2010 +0200

    Allow to build with gtk2 and gtk3
    Note that with gtk2 nautilus-extension will not be built as nautilus relies on gtk3 now
    Note also that both build should be parallel installable

 Makefile.am                         |   17 ++----
 configure.in                        |  116 +++++++++++++++++++++++------------
 data/Makefile.am                    |    7 +-
 libbrasero-burn.pc.in               |    6 +-
 libbrasero-burn/Makefile.am         |   83 ++++++++++++-------------
 libbrasero-burn/burn-basics.h       |    3 -
 libbrasero-media.pc.in              |    6 +-
 libbrasero-media/Makefile.am        |   53 ++++++++--------
 libbrasero-utils/Makefile.am        |   10 +--
 nautilus/Makefile.am                |    6 +-
 plugins/audio2cue/Makefile.am       |    4 +-
 plugins/cdrdao/Makefile.am          |    4 +-
 plugins/cdrkit/Makefile.am          |   12 ++--
 plugins/cdrtools/Makefile.am        |   16 +++---
 plugins/checksum/Makefile.am        |    8 +-
 plugins/checksum/burn-volume-read.c |    2 +-
 plugins/dvdauthor/Makefile.am       |    4 +-
 plugins/dvdcss/Makefile.am          |    6 +-
 plugins/growisofs/Makefile.am       |    8 +-
 plugins/libburnia/Makefile.am       |    8 +-
 plugins/local-track/Makefile.am     |    8 +-
 plugins/transcode/Makefile.am       |   12 ++--
 plugins/vcdimager/Makefile.am       |    4 +-
 src/Makefile.am                     |    6 +-
 24 files changed, 215 insertions(+), 194 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ff95509..c2fdf24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ endif
 
 braserodocdir = ${prefix}/docs/brasero
 
-
 EXTRA_DIST = 			\
 	AUTHORS			\
 	MAINTAINERS		\
@@ -16,9 +15,7 @@ EXTRA_DIST = 			\
 	intltool-extract.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	gnome-doc-utils.make	\
-	libbrasero-media.pc	\
-	libbrasero-burn.pc
+	gnome-doc-utils.make
 
 noinst_PROGRAMS =
 
@@ -32,18 +29,14 @@ DISTCHECK_CONFIGURE_FLAGS =		\
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
-	intltool-update
+	intltool-update	\
+	libbrasero-media BRASERO_LIBRARY_SUFFIX@.pc	\
+	libbrasero-burn BRASERO_LIBRARY_SUFFIX@.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libbrasero-media.pc libbrasero-burn.pc
+pkgconfig_DATA = libbrasero-media BRASERO_LIBRARY_SUFFIX@.pc libbrasero-burn BRASERO_LIBRARY_SUFFIX@.pc
 
-# Copy all the spec files. Of course, only one is actually used.
 dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
 	@if test -d "$(srcdir)/.git"; \
 	then \
 		echo Creating ChangeLog && \
diff --git a/configure.in b/configure.in
index 0599e23..3dbf70e 100644
--- a/configure.in
+++ b/configure.in
@@ -75,6 +75,7 @@ dnl ***************** GENERAL **********************************
 dnl ** reminder: the following set CFLAGS to -O2 -g if empty
 AC_PROG_CC
 AC_HEADER_STDC
+
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
   if test "x${prefix}" = "xNONE"; then
@@ -142,14 +143,11 @@ GTHREAD_REQUIRED=2.6.0
 GMODULE_REQUIRED=2.6.0
 GMODULE_EXPORT_REQUIRED=2.6.0
 GIO_REQUIRED=2.25.0
-GDK_REQUIRED=2.90.2
-GTK_REQUIRED=2.90.2
 GCONF_REQUIRED=2.31.1 
 GSTREAMER_REQUIRED=0.10.15
 GSTREAMER_BASE_REQUIRED=0.10.0
 LIBXML2_REQUIRED=2.6.0
 DBUS_REQUIRED=0.7.2
-CANBERRA_REQUIRED=0.1
 
 dnl ** used by brasero and one plugin
 PKG_CHECK_MODULES(BRASERO_GSTREAMER, 			\
@@ -209,13 +207,6 @@ PKG_CHECK_MODULES(BRASERO_GMODULE_EXPORT,		\
 AC_SUBST(BRASERO_GMODULE_EXPORT_CFLAGS)
 AC_SUBST(BRASERO_GMODULE_EXPORT_LIBS)
 
-PKG_CHECK_MODULES(BRASERO_GTK,			\
-	gdk-3.0 >= $GDK_REQUIRED		\
-	gtk+-3.0 >= $GTK_REQUIRED)
-
-AC_SUBST(BRASERO_GTK_CFLAGS)
-AC_SUBST(BRASERO_GTK_LIBS)
-
 PKG_CHECK_MODULES(BRASERO_DBUS,			\
 	dbus-glib-1 >= $DBUS_REQUIRED)
 
@@ -228,15 +219,66 @@ PKG_CHECK_MODULES(BRASERO_SM,			\
 AC_SUBST(BRASERO_SM_CFLAGS)
 AC_SUBST(BRASERO_SM_LIBS)
 
-PKG_CHECK_MODULES(BRASERO_CANBERRA,		\
+#
+# GTK+ stuff (taken and adapted from empathy)
+#
+GDK2_REQUIRED=2.6.0
+GTK2_REQUIRED=2.19.7
+
+GDK3_REQUIRED=2.90.2
+GTK3_REQUIRED=2.90.2
+
+CANBERRA_REQUIRED=0.1
+
+AC_ARG_ENABLE(gtk3,
+ AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
+ [build with GTK+3]), ,
+ enable_gtk3=auto)
+
+# Try to use GTK+3 if available
+if test "x$enable_gtk3" != "xno"; then
+ PKG_CHECK_MODULES(BRASERO_GTK,			\
+	gdk-3.0 >= $GDK3_REQUIRED		\
+	gtk+-3.0 >= $GTK3_REQUIRED,
+	enable_gtk3="yes", enable_gtk3="no")
+
+ GTK_API_VERSION=3
+ BRASERO_LIBRARY_SUFFIX=3
+fi
+
+# ...if not use GTK+2
+if test "x$enable_gtk3" == "xno"; then
+ PKG_CHECK_MODULES(BRASERO_GTK,			\
+	gdk-2.0 >= $GDK2_REQUIRED		\
+	gtk+-2.0 >= $GTK2_REQUIRED)
+
+ GTK_API_VERSION=2
+ BRASERO_LIBRARY_SUFFIX=
+fi
+
+AC_SUBST(GTK_API_VERSION)
+AC_SUBST(BRASERO_LIBRARY_SUFFIX)
+
+AC_SUBST(BRASERO_GTK_CFLAGS)
+AC_SUBST(BRASERO_GTK_LIBS)
+
+
+if test "x$enable_gtk3" = "xyes"; then
+ PKG_CHECK_MODULES(BRASERO_CANBERRA,		\
 	libcanberra >= $CANBERRA_REQUIRED       \
 	libcanberra-gtk3 >= $CANBERRA_REQUIRED)
+else
+ PKG_CHECK_MODULES(BRASERO_CANBERRA,		\
+	libcanberra >= $CANBERRA_REQUIRED       \
+	libcanberra-gtk >= $CANBERRA_REQUIRED)
+fi
 
 AC_SUBST(BRASERO_CANBERRA_CFLAGS)
 AC_SUBST(BRASERO_CANBERRA_LIBS)
 
 dnl ****************Nautilus**********************************
-NAUTILUS_REQUIRED=2.22.2
+# Note: the extension is built against gtk+3 so we cannot build extension with gtk+2
+NAUTILUS_REQUIRED=2.31.3
 
 AC_ARG_ENABLE(nautilus,
 			AS_HELP_STRING([--enable-nautilus],[Build Nautilus extension [[default=yes]]]),
@@ -248,13 +290,17 @@ AC_ARG_WITH(nautilusdir,
 			[ac_with_nautilusdir=$withval],
 			[ac_with_nautilusdir=""])
 
-if test x"$enable_nautilus" = "xyes"; then
-	PKG_CHECK_MODULES(NAUTILUS_EXTENSION,
+if test "x$enable_gtk3" = "xyes"; then
+ if test x"$enable_nautilus" = "xyes"; then
+ 	PKG_CHECK_MODULES(NAUTILUS_EXTENSION,
 			  libnautilus-extension >= $NAUTILUS_REQUIRED,
 			  build_nautilus=yes,
 			  build_nautilus=no)
-else
+ else
 	build_nautilus="no"
+ fi
+else
+ build_nautilus="no"
 fi
 
 if test x"$build_nautilus" = "xyes"; then
@@ -273,6 +319,14 @@ fi
 
 AM_CONDITIONAL(BUILD_NAUTILUS, test x"$build_nautilus" = "xyes")
 
+#
+# Installation path for plugins
+#
+
+BRASERO_PLUGIN_DIRECTORY=${libdir}/brasero${BRASERO_LIBRARY_SUFFIX}/plugins
+AC_DEFINE_UNQUOTED(BRASERO_PLUGIN_DIRECTORY, "${BRASERO_PLUGIN_DIRECTORY}", [Path where the plugins are installed])
+AC_SUBST(BRASERO_PLUGIN_DIRECTORY)
+
 dnl ****************check for libburn (optional)**************
 LIBBURN_REQUIRED=0.4.0
 LIBISOFS_REQUIRED=0.6.4
@@ -350,28 +404,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_GROWISOFS, test x"$build_growisofs" = "xyes")
 
-dnl ****************check for libnotify (optional)**************
-dnl disable because not used any more
-dnl LIBNOTIFY_REQUIRED=0.3.0
-
-dnl AC_ARG_ENABLE(libnotify,
-dnl			AS_HELP_STRING([--enable-libnotify],[use libnotify if available [[default=yes]]]),,
-dnl			[enable_libnotify="yes"])
-
-dnl if test x"$enable_libnotify" = "xyes"; then
-dnl	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED, build_libnotify=yes, build_libnotify=no)
-dnl else
-dnl	build_libnotify="no"
-dnl fi
-
-dnl if test x"$build_libnotify" = "xyes"; then
-dnl	BRASERO_CFLAGS="$BRASERO_CFLAGS $LIBNOTIFY_CFLAGS"
-dnl	BRASERO_LIBS="$BRASERO_LIBS $LIBNOTIFY_LIBS"
-dnl	AC_DEFINE(HAVE_LIBNOTIFY, 1, [define if you  want to use with libnotify support])
-dnl fi
-dnl AM_CONDITIONAL(HAVE_LIBNOTIFY, test x"$build_libnotify" = "xyes")
-
-dnl ****************check for search (optional)**************
 BEAGLE_REQUIRED=0.3.0
 TRACKER_REQUIRED=0.8.0
 
@@ -441,7 +473,7 @@ dnl ****************check for playlist (optional)**************
 TOTEM_REQUIRED=2.29.1
 
 AC_ARG_ENABLE(playlist,
-			AS_HELP_STRING([--enable-playlist],[Build playlist pane (if totem is available)[[default=yes]]]),
+			AS_HELP_STRING([--enable-playlist],[Build playlist pane (if totem-pl-parser is available)[[default=yes]]]),
 			[enable_playlist=$enableval],
 			[enable_playlist="yes"])
 
@@ -595,8 +627,6 @@ dnl ****** END ***********************
 
 AC_CONFIG_FILES([
 Makefile
-libbrasero-media.pc
-libbrasero-burn.pc
 docs/Makefile
 docs/reference/Makefile
 docs/reference/libbrasero-media/Makefile
@@ -631,6 +661,10 @@ plugins/vcdimager/Makefile
 po/Makefile.in
 src/Makefile
 ])
+
+AC_CONFIG_FILES([libbrasero-media${BRASERO_LIBRARY_SUFFIX}.pc:libbrasero-media.pc.in],[BRASERO_LIBRARY_SUFFIX=${BRASERO_LIBRARY_SUFFIX}])
+AC_CONFIG_FILES([libbrasero-burn${BRASERO_LIBRARY_SUFFIX}.pc:libbrasero-burn.pc.in],[BRASERO_LIBRARY_SUFFIX=${BRASERO_LIBRARY_SUFFIX}])
+
 AC_OUTPUT
 
 echo
@@ -641,12 +675,14 @@ echo "----------------------------------"
 dnl 	Build libnotify support : ${build_libnotify}
 
 echo "Version: $BRASERO_VERSION
+	Use GTK+3 : ${enable_gtk3}
 	Update caches: ${enable_caches}
 	Build Nautilus extension : ${build_nautilus}
 	Build inotify: ${enable_inotify}
 	Build search pane : ${build_search}
 	Build playlist pane : ${build_totem}
 	Build Preview pane : ${enable_preview}
+	Plugins installed in : ${BRASERO_PLUGIN_DIRECTORY}
 	Build cdrdao plugins : ${build_cdrdao}
 	Build cdrtools plugins : ${build_cdrtools}
 	Build cdrkit plugins : ${build_cdrkit}
diff --git a/data/Makefile.am b/data/Makefile.am
index 788e799..c75a435 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = icons mime
 convertdir=$(datadir)/GConf/gsettings
 convert_DATA=brasero.convert
 
-gsettings_SCHEMAS = org.gnome.brasero.gschema.xml
+gsettings_in_file = org.gnome.brasero.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
@@ -16,11 +17,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 IMAGES=	logo.png
 
 CLEANFILES =		$(desktop_DATA)		\
-			$(schemas_DATA)
+			$(gsettings_SCHEMAS)
 
 
 EXTRA_DIST = 		$(desktop_in_files)	\
-			$(gsettings_SCHEMAS)	\
+			$(gsettings_in_file)	\
 			$(convert_DATA)
 
 UPDATE_DESKTOP = \
diff --git a/libbrasero-burn.pc.in b/libbrasero-burn.pc.in
index 01253d9..2de565b 100644
--- a/libbrasero-burn.pc.in
+++ b/libbrasero-burn.pc.in
@@ -7,6 +7,6 @@ includedir= includedir@
 Name: libbrasero-burn
 Description: Brasero Optical Media Burning library
 Version: @VERSION@
-Requires: glib-2.0 gthread-2.0 gtk+-2.0 dbus-glib-1
-Libs: -L${libdir} -lbrasero-burn
-Cflags: -I${includedir}/brasero/
+Requires: glib-2.0 gthread-2.0 gtk+- GTK_API_VERSION@.0 dbus-glib-1
+Libs: -L${libdir} -lbrasero-burn BRASERO_LIBRARY_SUFFIX@
+Cflags: -I${includedir}/brasero BRASERO_LIBRARY_SUFFIX@
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 155ad3a..3891ae1 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -28,38 +28,37 @@ libbrasero-marshal.h: libbrasero-marshal.list
 libbrasero-marshal.c: libbrasero-marshal.h
 	( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --body --header > libbrasero-marshal.c )
 
-lib_LTLIBRARIES = \
-	libbrasero-burn.la
+headerdir=$(includedir)/brasero BRASERO_LIBRARY_SUFFIX@
+header_HEADERS =	brasero-tags.h						\
+		brasero-enums.h						\
+		brasero-error.h						\
+		brasero-status.h					\
+		brasero-burn-lib.h					\
+		brasero-track-type.h					\
+		brasero-track.h						\
+		brasero-track-data.h                 			\
+		brasero-track-data-cfg.h				\
+		brasero-track-disc.h                 			\
+		brasero-track-stream.h                 			\
+		brasero-track-stream-cfg.h             			\
+		brasero-track-image.h					\
+		brasero-track-image-cfg.h				\
+		brasero-session.h                 			\
+		brasero-session-span.h					\
+		brasero-session-cfg.h					\
+		brasero-burn.h						\
+		brasero-burn-options.h        			        \
+		brasero-burn-dialog.h					\
+		brasero-tool-dialog.h					\
+		brasero-sum-dialog.h					\
+		brasero-blank-dialog.h
 
-libbraseroburnincludedir = $(pkgincludedir)/
-libbraseroburninclude_HEADERS =					\
-	brasero-tags.h						\
-	brasero-enums.h						\
-	brasero-error.h						\
-	brasero-status.h					\
-	brasero-burn-lib.h					\
-	brasero-track-type.h					\
-	brasero-track.h						\
-	brasero-track-data.h                 			\
-	brasero-track-data-cfg.h				\
-	brasero-track-disc.h                 			\
-	brasero-track-stream.h                 			\
-	brasero-track-stream-cfg.h             			\
-	brasero-track-image.h					\
-	brasero-track-image-cfg.h				\
-	brasero-session.h                 			\
-	brasero-session-span.h					\
-	brasero-session-cfg.h					\
-	brasero-burn.h						\
-	brasero-burn-options.h        			        \
-	brasero-burn-dialog.h					\
-	brasero-tool-dialog.h					\
-	brasero-sum-dialog.h					\
-	brasero-blank-dialog.h
+lib_LTLIBRARIES = \
+	libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 
-libbrasero_burn_la_LIBADD =					\
-	../libbrasero-media/libbrasero-media.la			\
-	../libbrasero-utils/libbrasero-utils.la			\
+libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_LIBADD =					\
+	../libbrasero-media/libbrasero-media BRASERO_LIBRARY_SUFFIX@.la			\
+	../libbrasero-utils/libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la			\
 	$(BRASERO_GLIB_LIBS)					\
 	$(BRASERO_GTHREAD_LIBS)					\
 	$(BRASERO_GMODULE_LIBS)					\
@@ -69,13 +68,13 @@ libbrasero_burn_la_LIBADD =					\
 	$(BRASERO_DBUS_LIBS)                                    \
 	$(BRASERO_CANBERRA_LIBS)
 
-libbrasero_burn_la_LDFLAGS =					\
+libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
 	-no-undefined						\
 	-export-dynamic
 #	-export-symbols ./libbrasero-burn.symbols
 
-libbrasero_burn_la_SOURCES = 		\
+libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_SOURCES = 		\
 	libbrasero-marshal.c		\
 	libbrasero-marshal.h		\
 	brasero-tool-dialog.c         \
@@ -196,7 +195,7 @@ libbrasero_burn_la_SOURCES = 		\
 	brasero-plugin-private.h                 
 
 if BUILD_INOTIFY
-libbrasero_burn_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
+libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
 endif
 
 EXTRA_DIST =			\
@@ -205,24 +204,24 @@ EXTRA_DIST =			\
 
 if HAVE_INTROSPECTION
 girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = BraseroBurn-1.0.gir
+gir_DATA = BraseroBurn- BRASERO_VERSION@.gir
 
 typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-typelibs_DATA = BraseroBurn-1.0.typelib
+typelibs_DATA = BraseroBurn- BRASERO_VERSION@.typelib
 
-BraseroBurn-1.0.gir: libbrasero-burn.la $(INTROSPECTION_SCANNER)
+BraseroBurn- BRASERO_VERSION@.gir: libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la $(INTROSPECTION_SCANNER)
 	$(INTROSPECTION_SCANNER) -v --namespace=BraseroBurn --nsversion=1.0 \
 	    -I$(top_srcdir)/libbrasero-media	\
 	    -I$(top_builddir)/libbrasero-media	\
 	    -I$(top_srcdir)/libbrasero-burn		\
 	    -I$(top_builddir)/libbrasero-burn	\
-            --include=Gtk-2.0 \
+            --include=Gtk- GTK_API_VERSION@.0 \
             --add-include-path=$(top_builddir)/libbrasero-media	\
-	    --include=BraseroMedia-1.0 \
-	    --library=brasero-burn \
+	    --include=BraseroMedia- BRASERO_VERSION@ \
+	    --library=brasero-burn BRASERO_LIBRARY_SUFFIX@ \
 	    --libtool="$(LIBTOOL)" \
             --output $@ \
-            --pkg=gtk+-2.0  \
+            --pkg=gtk+- GTK_API_VERSION@.0  \
 	    --strip-prefix=Brasero	\
             $(top_srcdir)/libbrasero-burn/brasero-tags.h						\
             $(top_srcdir)/libbrasero-burn/brasero-enums.h						\
@@ -248,8 +247,8 @@ BraseroBurn-1.0.gir: libbrasero-burn.la $(INTROSPECTION_SCANNER)
 	    $(top_srcdir)/libbrasero-burn/brasero-sum-dialog.h					\
 	    $(top_srcdir)/libbrasero-burn/*.c	    
 
-BraseroBurn-1.0.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
-	$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-burn/$(gir_DATA) --shared-library=libbrasero-burn -o $(typelibs_DATA) --includedir=$(top_builddir)/libbrasero-media
+BraseroBurn- BRASERO_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
+	$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-burn/$(gir_DATA) --shared-library=libbrasero-burn BRASERO_LIBRARY_SUFFIX@ -o $(typelibs_DATA) --includedir=$(top_builddir)/libbrasero-media
 endif
 
 CLEANFILES =			\
diff --git a/libbrasero-burn/burn-basics.h b/libbrasero-burn/burn-basics.h
index c3d11c3..fce6e21 100644
--- a/libbrasero-burn/burn-basics.h
+++ b/libbrasero-burn/burn-basics.h
@@ -39,9 +39,6 @@
 
 G_BEGIN_DECLS
 
-#define BRASERO_PLUGIN_DIRECTORY		BRASERO_LIBDIR "/brasero/plugins"
-#define BRASERO_PLUGIN_KEY			"/apps/brasero/config/plugins"
-
 #define BRASERO_BURN_TMP_FILE_NAME		"brasero_tmp_XXXXXX"
 
 #define BRASERO_MD5_FILE			".checksum.md5"
diff --git a/libbrasero-media.pc.in b/libbrasero-media.pc.in
index dd272bf..2d77900 100644
--- a/libbrasero-media.pc.in
+++ b/libbrasero-media.pc.in
@@ -7,6 +7,6 @@ includedir= includedir@
 Name: libbrasero-media
 Description: Brasero Optical Media library
 Version: @VERSION@
-Requires: glib-2.0 gthread-2.0 gtk+-2.0
-Libs: -L${libdir} -lbrasero-media
-Cflags: -I${includedir}/brasero/
+Requires: glib-2.0 gthread-2.0 gtk+- GTK_API_VERSION@.0
+Libs: -L${libdir} -lbrasero-media BRASERO_LIBRARY_SUFFIX@
+Cflags: -I${includedir}/brasero BRASERO_LIBRARY_SUFFIX@
diff --git a/libbrasero-media/Makefile.am b/libbrasero-media/Makefile.am
index 135ba22..0318ec3 100644
--- a/libbrasero-media/Makefile.am
+++ b/libbrasero-media/Makefile.am
@@ -22,21 +22,20 @@ libbrasero-marshal.h: libbrasero-marshal.list
 libbrasero-marshal.c: libbrasero-marshal.h
 	( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --body --header > libbrasero-marshal.c )
 
-lib_LTLIBRARIES = 				\
-	libbrasero-media.la
+headerdir=$(includedir)/brasero BRASERO_LIBRARY_SUFFIX@
+header_HEADERS =	brasero-drive.h			\
+		brasero-medium-monitor.h		\
+		brasero-media.h			\
+		brasero-units.h			\
+		brasero-medium.h			\
+		brasero-volume.h		\
+		brasero-medium-selection.h	\
+		brasero-drive-selection.h
 
-libbraseromediaincludedir = $(pkgincludedir)/
-libbraseromediainclude_HEADERS =	\
-	brasero-drive.h			\
-	brasero-medium-monitor.h		\
-	brasero-media.h			\
-	brasero-units.h			\
-	brasero-medium.h			\
-	brasero-volume.h		\
-	brasero-medium-selection.h	\
-	brasero-drive-selection.h
+lib_LTLIBRARIES = 				\
+	libbrasero-media BRASERO_LIBRARY_SUFFIX@.la
 
-libbrasero_media_la_LIBADD =                                     \
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_LIBADD =                                     \
 	$(BRASERO_GLIB_LIBS)                                     \
 	$(BRASERO_GMODULE_EXPORT_LIBS)                                     \
 	$(BRASERO_GTHREAD_LIBS)                                     \
@@ -44,13 +43,13 @@ libbrasero_media_la_LIBADD =                                     \
 	$(BRASERO_GTK_LIBS)                                     \
 	$(BRASERO_SCSI_LIBS)
 
-libbrasero_media_la_LDFLAGS =					\
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
 	-no-undefined
 	$(AM_LDFLAGS)
 #	-export-symbols ./libbrasero-media.symbols
 
-libbrasero_media_la_SOURCES =		\
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES =		\
 	libbrasero-marshal.c		\
 	libbrasero-marshal.h		\
 	brasero-drive.h			\
@@ -133,39 +132,39 @@ libbrasero_media_la_SOURCES =		\
 
 # FreeBSD's SCSI CAM interface
 if HAVE_CAM_LIB_H
-libbrasero_media_la_SOURCES += scsi-cam.c
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-cam.c
 endif
 
 # Linux's SCSI CAM interface
 if HAVE_SG_IO_HDR_T
-libbrasero_media_la_SOURCES += scsi-sg.c
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-sg.c
 endif
 
 # NetBSD's scsi(4)
 if HAVE_SCSIIO_H
-libbrasero_media_la_SOURCES += scsi-netbsd.c
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-netbsd.c
 endif
 
 # Solaris's USCSI interface
 if HAVE_USCSI_H
-libbrasero_media_la_SOURCES += scsi-uscsi.c
+libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-uscsi.c
 endif
 
 if HAVE_INTROSPECTION
 girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = BraseroMedia-1.0.gir
+gir_DATA = BraseroMedia- BRASERO_VERSION@.gir
 
 typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-typelibs_DATA = BraseroMedia-1.0.typelib
+typelibs_DATA = BraseroMedia- BRASERO_VERSION@.typelib
 
-BraseroMedia-1.0.gir: libbrasero-media.la $(INTROSPECTION_SCANNER)
+BraseroMedia- BRASERO_VERSION@.gir: libbrasero-media BRASERO_LIBRARY_SUFFIX@.la $(INTROSPECTION_SCANNER)
 	$(INTROSPECTION_SCANNER) -v --namespace=BraseroMedia --nsversion=1.0 \
-            --include=Gtk-2.0 \
+            --include=Gtk- GTK_API_VERSION@.0 \
 	    -I$(top_srcdir)/libbrasero-media	\
-	    --library=brasero-media \
+	    --library=brasero-media BRASERO_LIBRARY_SUFFIX@ \
 	    --libtool="$(LIBTOOL)" \
             --output $@ \
-            --pkg=gtk+-2.0  \
+            --pkg=gtk+- GTK_API_VERSION@.0  \
 	    --strip-prefix=Brasero	\
             $(top_srcdir)/libbrasero-media/brasero-drive.h			\
 	    $(top_srcdir)/libbrasero-media/brasero-medium-monitor.h		\
@@ -177,8 +176,8 @@ BraseroMedia-1.0.gir: libbrasero-media.la $(INTROSPECTION_SCANNER)
 	    $(top_srcdir)/libbrasero-media/brasero-drive-selection.h	\
             $(top_srcdir)/libbrasero-media/*.c	    
 
-BraseroMedia-1.0.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
-	$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-media/$(gir_DATA) --shared-library=libbrasero-media -o $(typelibs_DATA)
+BraseroMedia- BRASERO_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
+	$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-media/$(gir_DATA) --shared-library=libbrasero-media BRASERO_LIBRARY_SUFFIX@ -o $(typelibs_DATA)
 endif
 
 EXTRA_DIST =			\
diff --git a/libbrasero-utils/Makefile.am b/libbrasero-utils/Makefile.am
index d8d8d0d..e9cb29c 100644
--- a/libbrasero-utils/Makefile.am
+++ b/libbrasero-utils/Makefile.am
@@ -19,9 +19,9 @@ INCLUDES = \
 
 
 lib_LTLIBRARIES = \
-	libbrasero-utils.la
+	libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la
 
-libbrasero_utils_la_LIBADD =					\
+libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_LIBADD =					\
 	$(BRASERO_GLIB_LIBS)					\
 	$(BRASERO_GIO_LIBS)		\
 	$(BRASERO_DBUS_LIBS)		\
@@ -30,13 +30,12 @@ libbrasero_utils_la_LIBADD =					\
 	$(BRASERO_PL_PARSER_LIBS)	\
 	$(BRASERO_GTK_LIBS)
 
-
-libbrasero_utils_la_LDFLAGS =					\
+libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS =					\
 	-version-info $(LIBBRASERO_LT_VERSION)			\
 	-no-undefined
 #	-export-symbols ./libbrasero-utils.symbols
 
-libbrasero_utils_la_SOURCES =		\
+libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_SOURCES =		\
 	brasero-disc-message.c        \
 	brasero-disc-message.h        \
 	brasero-misc.c        \
@@ -69,6 +68,5 @@ libbrasero_utils_la_SOURCES =		\
 
 CLEANFILES =			\
 	$(RECMARSHALFILES)
-	
 
 -include $(top_srcdir)/git.mk
diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
index 4a11915..3076101 100644
--- a/nautilus/Makefile.am
+++ b/nautilus/Makefile.am
@@ -50,9 +50,9 @@ libnautilus_brasero_extension_la_SOURCES = 	\
 
 libnautilus_brasero_extension_la_LIBADD =	\
 	$(NAUTILUS_EXTENSION_LIBS)		\
-	../libbrasero-utils/libbrasero-utils.la	\
-	../libbrasero-media/libbrasero-media.la	\
-	../libbrasero-burn/libbrasero-burn.la
+	../libbrasero-utils/libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la	\
+	../libbrasero-media/libbrasero-media BRASERO_LIBRARY_SUFFIX@.la	\
+	../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 	
 libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
 
diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
index e007628..abed438 100644
--- a/plugins/audio2cue/Makefile.am
+++ b/plugins/audio2cue/Makefile.am
@@ -15,10 +15,10 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #audio2cue
-audio2cuedir = $(libdir)/brasero/plugins
+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.la
+libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 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 5d37fbb..0cf0c51 100644
--- a/plugins/cdrdao/Makefile.am
+++ b/plugins/cdrdao/Makefile.am
@@ -15,10 +15,10 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #cdrdao
-cdrdaodir = $(libdir)/brasero/plugins
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
index d6f5055..9900c6d 100644
--- a/plugins/cdrkit/Makefile.am
+++ b/plugins/cdrkit/Makefile.am
@@ -15,27 +15,27 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #wodim
-wodimdir = $(libdir)/brasero/plugins
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 #genisoimage
-genisoimagedir = $(libdir)/brasero/plugins
+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.la
+libbrasero_genisoimage_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
 
 #readom
-readomdir = $(libdir)/brasero/plugins
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
index 6c8c14c..c70d497 100644
--- a/plugins/cdrtools/Makefile.am
+++ b/plugins/cdrtools/Makefile.am
@@ -15,34 +15,34 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #cdrecord
-cdrecorddir = $(libdir)/brasero/plugins
+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.la
+libbrasero_cdrecord_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
 
 #mkisofs
-mkisofsdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_mkisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
 
 #readcd
-readcddir = $(libdir)/brasero/plugins
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 #cdda2wav
-cdda2wavdir = $(libdir)/brasero/plugins
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
index 993f0d9..f7069bf 100644
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -15,20 +15,20 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)				\
 	$(BRASERO_GTK_CFLAGS)
 
-checksumdir = $(libdir)/brasero/plugins
+checksumdir = $(BRASERO_PLUGIN_DIRECTORY)
 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.la ../../libbrasero-burn/libbrasero-burn.la
+libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 
-checksumfiledir = $(libdir)/brasero/plugins
+checksumfiledir = $(BRASERO_PLUGIN_DIRECTORY)
 checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
 libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
 				      burn-volume-read.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.la ../../libbrasero-burn/libbrasero-burn.la
+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
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checksum/burn-volume-read.c b/plugins/checksum/burn-volume-read.c
index 7f8b56e..0d6b26e 100644
--- a/plugins/checksum/burn-volume-read.c
+++ b/plugins/checksum/burn-volume-read.c
@@ -289,7 +289,7 @@ brasero_volume_file_read_line (BraseroVolFileHandle *handle,
 
 	/* continue while remaining data is too small to fit buffer */
 	while (!len || (len - buffer_offset) > (handle->buffer_max - handle->offset)) {
-		BraseroScsiResult result;
+		BraseroBurnResult result;
 
 		/* copy what we already have in the buffer. */
 		if (buffer)
diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
index 3972efd..9bbc9ce 100644
--- a/plugins/dvdauthor/Makefile.am
+++ b/plugins/dvdauthor/Makefile.am
@@ -15,11 +15,11 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)				\
 	$(BRASERO_LIBXML_CFLAGS)
 
-dvdauthordir = $(libdir)/brasero/plugins
+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.la
+libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
 
 
diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
index dc58a1d..19dc213 100644
--- a/plugins/dvdcss/Makefile.am
+++ b/plugins/dvdcss/Makefile.am
@@ -1,5 +1,3 @@
-plugindir = $(libdir)/brasero/plugins
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/libbrasero-media/					\
@@ -15,11 +13,11 @@ INCLUDES = \
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_GLIB_CFLAGS)
 
+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.la ../../libbrasero-burn/libbrasero-burn.la
+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_LDFLAGS = -module -avoid-version
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
index dca2b01..cee046b 100644
--- a/plugins/growisofs/Makefile.am
+++ b/plugins/growisofs/Makefile.am
@@ -15,18 +15,18 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #growisofs
-growisofsdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_growisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
 
 #dvdrwformat
-dvdrwformatdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 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 f4ba47b..379501a 100644
--- a/plugins/libburnia/Makefile.am
+++ b/plugins/libburnia/Makefile.am
@@ -17,22 +17,22 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)
 
 #libburn
-libburndir = $(libdir)/brasero/plugins
+libburndir = $(BRASERO_PLUGIN_DIRECTORY)
 libburn_LTLIBRARIES = libbrasero-libburn.la
 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.la
+libbrasero_libburn_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_libburn_la_LDFLAGS = -module -avoid-version
 
 #libisofs (apparently libisofs needs one libburn function)
-libisofsdir = $(libdir)/brasero/plugins
+libisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
 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.la
+libbrasero_libisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 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 09a92e7..0991bfe 100644
--- a/plugins/local-track/Makefile.am
+++ b/plugins/local-track/Makefile.am
@@ -16,19 +16,19 @@ INCLUDES = \
 	$(BRASERO_GIO_CFLAGS)
 
 #local-track
-local_trackdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_local_track_la_LDFLAGS = -module -avoid-version
 
 #burn-uri
-burn_uridir = $(libdir)/brasero/plugins
+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.la
+libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 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 83f4af3..3a029e0 100644
--- a/plugins/transcode/Makefile.am
+++ b/plugins/transcode/Makefile.am
@@ -15,25 +15,25 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)				\
 	$(BRASERO_GSTREAMER_CFLAGS)
 
-transcodedir = $(libdir)/brasero/plugins
+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.la
+libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_transcode_la_LDFLAGS = -module -avoid-version
 
-normalizedir = $(libdir)/brasero/plugins
+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.la
+libbrasero_normalize_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_normalize_la_LDFLAGS = -module -avoid-version
 
-vobdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 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 696b058..d11a077 100644
--- a/plugins/vcdimager/Makefile.am
+++ b/plugins/vcdimager/Makefile.am
@@ -15,11 +15,11 @@ INCLUDES = \
 	$(BRASERO_GLIB_CFLAGS)					\
 	$(BRASERO_LIBXML_CFLAGS)
 
-vcdimagerdir = $(libdir)/brasero/plugins
+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.la
+libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
 libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 44010fb..7f91e6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,9 +155,9 @@ brasero_SOURCES += \
 endif
 
 brasero_LDADD =						\
-	$(top_builddir)/libbrasero-media/libbrasero-media.la	\
-	$(top_builddir)/libbrasero-burn/libbrasero-burn.la	\
-	$(top_builddir)/libbrasero-utils/libbrasero-utils.la	\
+	$(top_builddir)/libbrasero-media/libbrasero-media BRASERO_LIBRARY_SUFFIX@.la	\
+	$(top_builddir)/libbrasero-burn/libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la	\
+	$(top_builddir)/libbrasero-utils/libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la	\
 	$(BRASERO_GLIB_LIBS)		\
 	$(BRASERO_GTHREAD_LIBS)				\
 	$(BRASERO_GIO_LIBS)		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]