[brasero] Remove crufts remaing from the time we could build against gtk 2 and 3
- From: Philippe Rouquier <philippr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Remove crufts remaing from the time we could build against gtk 2 and 3
- Date: Tue, 25 Jan 2011 10:53:20 +0000 (UTC)
commit 76d4eaa4d39b4d386a541a93c47252abf4ae66e5
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Tue Jan 25 11:51:05 2011 +0100
Remove crufts remaing from the time we could build against gtk 2 and 3
Makefile.am | 6 +++---
configure.in | 14 ++++----------
libbrasero-burn/Makefile.am | 26 +++++++++++++-------------
libbrasero-burn3.pc.in | 12 ++++++++++++
libbrasero-media/Makefile.am | 28 ++++++++++++++--------------
libbrasero-media3.pc.in | 12 ++++++++++++
libbrasero-utils/Makefile.am | 8 ++++----
libbrasero-utils/brasero-jacket-view.c | 3 ---
nautilus/Makefile.am | 6 +++---
plugins/audio2cue/Makefile.am | 2 +-
plugins/cdrdao/Makefile.am | 2 +-
plugins/cdrkit/Makefile.am | 6 +++---
plugins/cdrtools/Makefile.am | 8 ++++----
plugins/checksum/Makefile.am | 4 ++--
plugins/dvdauthor/Makefile.am | 2 +-
plugins/dvdcss/Makefile.am | 2 +-
plugins/growisofs/Makefile.am | 4 ++--
plugins/libburnia/Makefile.am | 4 ++--
plugins/local-track/Makefile.am | 4 ++--
plugins/transcode/Makefile.am | 6 +++---
plugins/vcdimager/Makefile.am | 2 +-
src/Makefile.am | 6 +++---
22 files changed, 91 insertions(+), 76 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c2fdf24..ec29f62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,11 +30,11 @@ DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
- libbrasero-media BRASERO_LIBRARY_SUFFIX@.pc \
- libbrasero-burn BRASERO_LIBRARY_SUFFIX@.pc
+ libbrasero-media3.pc \
+ libbrasero-burn3.pc
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libbrasero-media BRASERO_LIBRARY_SUFFIX@.pc libbrasero-burn BRASERO_LIBRARY_SUFFIX@.pc
+pkgconfig_DATA = libbrasero-media3.pc libbrasero-burn3.pc
dist-hook:
@if test -d "$(srcdir)/.git"; \
diff --git a/configure.in b/configure.in
index 43505be..2c72a63 100644
--- a/configure.in
+++ b/configure.in
@@ -217,17 +217,12 @@ AC_SUBST(BRASERO_SM_LIBS)
# GTK+ stuff (taken and adapted from empathy)
#
-GTK_API_VERSION=3.0
GTK_REQUIRED=2.91.7
-BRASERO_LIBRARY_SUFFIX=3
PKG_CHECK_MODULES([BRASERO_GTK], \
gtk+-3.0 >= $GTK_REQUIRED \
gdk-x11-3.0)
-AC_SUBST(GTK_API_VERSION)
-AC_SUBST(BRASERO_LIBRARY_SUFFIX)
-
AC_SUBST(BRASERO_GTK_CFLAGS)
AC_SUBST(BRASERO_GTK_LIBS)
@@ -297,7 +292,7 @@ AM_CONDITIONAL(BUILD_NAUTILUS, test x"$build_nautilus" = "xyes")
# Installation path for plugins
#
-BRASERO_PLUGIN_DIRECTORY=${libdir}/brasero${BRASERO_LIBRARY_SUFFIX}/plugins
+BRASERO_PLUGIN_DIRECTORY=${libdir}/brasero3/plugins
AC_SUBST(BRASERO_PLUGIN_DIRECTORY)
dnl ****************check for libburn (optional)**************
@@ -633,11 +628,10 @@ plugins/local-track/Makefile
plugins/vcdimager/Makefile
po/Makefile.in
src/Makefile
+libbrasero-media3.pc
+libbrasero-burn3.pc
])
-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
@@ -648,7 +642,7 @@ echo "----------------------------------"
dnl Build libnotify support : ${build_libnotify}
echo "Version: $BRASERO_VERSION
- Using GTK+ ${GTK_API_VERSION}
+ Using GTK+ 3
Update caches: ${enable_caches}
Build Nautilus extension : ${build_nautilus}
Build inotify: ${enable_inotify}
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 3840796..2e64449 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -29,7 +29,7 @@ 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 )
-headerdir=$(includedir)/brasero BRASERO_LIBRARY_SUFFIX@
+headerdir=$(includedir)/brasero3
header_HEADERS = brasero-tags.h \
brasero-enums.h \
brasero-error.h \
@@ -55,11 +55,11 @@ header_HEADERS = brasero-tags.h \
brasero-blank-dialog.h
lib_LTLIBRARIES = \
- libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la
+ libbrasero-burn3.la
-libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_LIBADD = \
- ../libbrasero-media/libbrasero-media BRASERO_LIBRARY_SUFFIX@.la \
- ../libbrasero-utils/libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la \
+libbrasero_burn3_la_LIBADD = \
+ ../libbrasero-media/libbrasero-media3.la \
+ ../libbrasero-utils/libbrasero-utils3.la \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
$(BRASERO_GMODULE_LIBS) \
@@ -69,13 +69,13 @@ libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_LIBADD = \
$(BRASERO_LIBNOTIFY_LIBS) \
$(BRASERO_CANBERRA_LIBS)
-libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS = \
+libbrasero_burn3_la_LDFLAGS = \
-version-info $(LIBBRASERO_LT_VERSION) \
-no-undefined \
-export-dynamic
# -export-symbols ./libbrasero-burn.symbols
-libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_SOURCES = \
+libbrasero_burn3_la_SOURCES = \
libbrasero-marshal.c \
libbrasero-marshal.h \
brasero-tool-dialog.c \
@@ -194,7 +194,7 @@ libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_SOURCES = \
brasero-plugin-private.h
if BUILD_INOTIFY
-libbrasero_burn BRASERO_LIBRARY_SUFFIX@_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
+libbrasero_burn3_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
endif
EXTRA_DIST = \
@@ -208,19 +208,19 @@ gir_DATA = BraseroBurn- BRASERO_VERSION@.gir
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = BraseroBurn- BRASERO_VERSION@.typelib
-BraseroBurn- BRASERO_VERSION@.gir: libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la $(INTROSPECTION_SCANNER)
+BraseroBurn- BRASERO_VERSION@.gir: libbrasero-burn3.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- GTK_API_VERSION@ \
+ --include=Gtk-3.0 \
--add-include-path=$(top_builddir)/libbrasero-media \
--include=BraseroMedia- BRASERO_VERSION@ \
- --library=brasero-burn BRASERO_LIBRARY_SUFFIX@ \
+ --library=brasero-burn3 \
--libtool="$(LIBTOOL)" \
--output $@ \
- --pkg=gtk+- GTK_API_VERSION@ \
+ --pkg=gtk+-3.0 \
--strip-prefix=Brasero \
$(top_srcdir)/libbrasero-burn/brasero-tags.h \
$(top_srcdir)/libbrasero-burn/brasero-enums.h \
@@ -247,7 +247,7 @@ BraseroBurn- BRASERO_VERSION@.gir: libbrasero-burn BRASERO_LIBRARY_SUFFIX@.la $(
$(top_srcdir)/libbrasero-burn/*.c
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
+ $(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-burn/$(gir_DATA) --shared-library=libbrasero-burn3 -o $(typelibs_DATA) --includedir=$(top_builddir)/libbrasero-media
endif
CLEANFILES = \
diff --git a/libbrasero-burn3.pc.in b/libbrasero-burn3.pc.in
new file mode 100644
index 0000000..456ba00
--- /dev/null
+++ b/libbrasero-burn3.pc.in
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+
+Name: libbrasero-burn
+Description: Brasero Optical Media Burning library
+Version: @VERSION@
+Requires: glib-2.0 gthread-2.0 gtk+-3
+Libs: -L${libdir} -lbrasero-burn3
+Cflags: -I${includedir}/brasero3
diff --git a/libbrasero-media/Makefile.am b/libbrasero-media/Makefile.am
index 7664811..22307b8 100644
--- a/libbrasero-media/Makefile.am
+++ b/libbrasero-media/Makefile.am
@@ -22,7 +22,7 @@ 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 )
-headerdir=$(includedir)/brasero BRASERO_LIBRARY_SUFFIX@
+headerdir=$(includedir)/brasero3
header_HEADERS = brasero-drive.h \
brasero-medium-monitor.h \
brasero-media.h \
@@ -33,9 +33,9 @@ header_HEADERS = brasero-drive.h \
brasero-drive-selection.h
lib_LTLIBRARIES = \
- libbrasero-media BRASERO_LIBRARY_SUFFIX@.la
+ libbrasero-media3.la
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_LIBADD = \
+libbrasero_media3_la_LIBADD = \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GMODULE_EXPORT_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
@@ -43,13 +43,13 @@ libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_LIBADD =
$(BRASERO_GTK_LIBS) \
$(BRASERO_SCSI_LIBS)
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS = \
+libbrasero_media3_la_LDFLAGS = \
-version-info $(LIBBRASERO_LT_VERSION) \
-no-undefined
$(AM_LDFLAGS)
# -export-symbols ./libbrasero-media.symbols
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES = \
+libbrasero_media3_la_SOURCES = \
libbrasero-marshal.c \
libbrasero-marshal.h \
brasero-drive.h \
@@ -132,22 +132,22 @@ libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES = \
# FreeBSD's SCSI CAM interface
if HAVE_CAM_LIB_H
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-cam.c
+libbrasero_media3_la_SOURCES += scsi-cam.c
endif
# Linux's SCSI CAM interface
if HAVE_SG_IO_HDR_T
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-sg.c
+libbrasero_media3_la_SOURCES += scsi-sg.c
endif
# NetBSD's scsi(4)
if HAVE_SCSIIO_H
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-netbsd.c
+libbrasero_media3_la_SOURCES += scsi-netbsd.c
endif
# Solaris's USCSI interface
if HAVE_USCSI_H
-libbrasero_media BRASERO_LIBRARY_SUFFIX@_la_SOURCES += scsi-uscsi.c
+libbrasero_media3_la_SOURCES += scsi-uscsi.c
endif
if HAVE_INTROSPECTION
@@ -157,14 +157,14 @@ gir_DATA = BraseroMedia- BRASERO_VERSION@.gir
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = BraseroMedia- BRASERO_VERSION@.typelib
-BraseroMedia- BRASERO_VERSION@.gir: libbrasero-media BRASERO_LIBRARY_SUFFIX@.la $(INTROSPECTION_SCANNER)
+BraseroMedia- BRASERO_VERSION@.gir: libbrasero-media3.la $(INTROSPECTION_SCANNER)
$(INTROSPECTION_SCANNER) -v --namespace=BraseroMedia --nsversion=1.0 \
- --include=Gtk- GTK_API_VERSION@ \
+ --include=Gtk-3.0 \
-I$(top_srcdir)/libbrasero-media \
- --library=brasero-media BRASERO_LIBRARY_SUFFIX@ \
+ --library=brasero-media3 \
--libtool="$(LIBTOOL)" \
--output $@ \
- --pkg=gtk+- GTK_API_VERSION@ \
+ --pkg=gtk+-3.0 \
--strip-prefix=Brasero \
$(top_srcdir)/libbrasero-media/brasero-drive.h \
$(top_srcdir)/libbrasero-media/brasero-medium-monitor.h \
@@ -177,7 +177,7 @@ BraseroMedia- BRASERO_VERSION@.gir: libbrasero-media BRASERO_LIBRARY_SUFFIX@.la
$(top_srcdir)/libbrasero-media/*.c
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)
+ $(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-media/$(gir_DATA) --shared-library=libbrasero-media3 -o $(typelibs_DATA)
endif
EXTRA_DIST = \
diff --git a/libbrasero-media3.pc.in b/libbrasero-media3.pc.in
new file mode 100644
index 0000000..aacddc7
--- /dev/null
+++ b/libbrasero-media3.pc.in
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+
+Name: libbrasero-media
+Description: Brasero Optical Media library
+Version: @VERSION@
+Requires: glib-2.0 gthread-2.0 gtk+-3
+Libs: -L${libdir} -lbrasero-media3
+Cflags: -I${includedir}/brasero3
diff --git a/libbrasero-utils/Makefile.am b/libbrasero-utils/Makefile.am
index dc0e2d7..fe03a8f 100644
--- a/libbrasero-utils/Makefile.am
+++ b/libbrasero-utils/Makefile.am
@@ -18,9 +18,9 @@ INCLUDES = \
lib_LTLIBRARIES = \
- libbrasero-utils BRASERO_LIBRARY_SUFFIX@.la
+ libbrasero-utils3.la
-libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_LIBADD = \
+libbrasero_utils3_la_LIBADD = \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GIO_LIBS) \
$(BRASERO_GSTREAMER_LIBS) \
@@ -28,12 +28,12 @@ libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_LIBADD = \
$(BRASERO_PL_PARSER_LIBS) \
$(BRASERO_GTK_LIBS)
-libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_LDFLAGS = \
+libbrasero_utils3_la_LDFLAGS = \
-version-info $(LIBBRASERO_LT_VERSION) \
-no-undefined
# -export-symbols ./libbrasero-utils.symbols
-libbrasero_utils BRASERO_LIBRARY_SUFFIX@_la_SOURCES = \
+libbrasero_utils3_la_SOURCES = \
brasero-disc-message.c \
brasero-disc-message.h \
brasero-misc.c \
diff --git a/libbrasero-utils/brasero-jacket-view.c b/libbrasero-utils/brasero-jacket-view.c
index a5f50a2..a2b8d55 100644
--- a/libbrasero-utils/brasero-jacket-view.c
+++ b/libbrasero-utils/brasero-jacket-view.c
@@ -1265,9 +1265,6 @@ brasero_jacket_view_realize (GtkWidget *widget)
gdk_window_set_user_data (window, widget);
gtk_widget_set_realized (widget, TRUE);
-
- gtk_widget_style_attach (widget);
-
gdk_window_show (gtk_widget_get_window (widget));
}
diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
index de41521..dc74eed 100644
--- a/nautilus/Makefile.am
+++ b/nautilus/Makefile.am
@@ -46,9 +46,9 @@ libnautilus_brasero_extension_la_SOURCES = \
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-utils/libbrasero-utils3.la \
+ ../libbrasero-media/libbrasero-media3.la \
+ ../libbrasero-burn/libbrasero-burn3.la
libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
index abed438..60fcae7 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.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 0cf0c51..b46c9a8 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 9900c6d..20e7f8a 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 c70d497..b82b753 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 f7069bf..57855e4 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-include $(top_srcdir)/git.mk
diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
index 9bbc9ce..3ecbff4 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
index 19dc213..8f6718c 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS) ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 cee046b..8dd3328 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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn3.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 379501a..1351967 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn3.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 0991bfe..5f75139 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn3.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 3a029e0..3ce1d28 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
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 = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn3.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 d11a077..2a55f8c 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 = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn3.la
libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
diff --git a/src/Makefile.am b/src/Makefile.am
index c9ede7f..f3b1b1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,9 +144,9 @@ brasero_SOURCES += \
endif
brasero_LDADD = \
- $(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 \
+ $(top_builddir)/libbrasero-media/libbrasero-media3.la \
+ $(top_builddir)/libbrasero-burn/libbrasero-burn3.la \
+ $(top_builddir)/libbrasero-utils/libbrasero-utils3.la \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
$(BRASERO_GIO_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]