Commit c65485cc authored by Philippe Rouquier's avatar Philippe Rouquier

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
parent af3b8cd8
......@@ -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 && \
......
......@@ -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}
......
......@@ -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 = \
......
......@@ -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@
......@@ -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 = \
......
......@@ -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"
......
......@@ -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@
......@@ -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 = \
......
......@@ -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
......@@ -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)
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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)
......
......@@ -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
......
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