brasero r1706 - in trunk: . brasero-media docs/reference src src/plugins/cdrdao src/plugins/cdrkit src/plugins/cdrtools src/plugins/checksum src/plugins/dvdauthor src/plugins/dvdcss src/plugins/growisofs src/plugins/libburnia src/plugins/local-track src/plugins/transcode src/plugins/vcdimager
- From: philippr svn gnome org
- To: svn-commits-list gnome org
- Subject: brasero r1706 - in trunk: . brasero-media docs/reference src src/plugins/cdrdao src/plugins/cdrkit src/plugins/cdrtools src/plugins/checksum src/plugins/dvdauthor src/plugins/dvdcss src/plugins/growisofs src/plugins/libburnia src/plugins/local-track src/plugins/transcode src/plugins/vcdimager
- Date: Wed, 7 Jan 2009 19:22:02 +0000 (UTC)
Author: philippr
Date: Wed Jan 7 19:22:02 2009
New Revision: 1706
URL: http://svn.gnome.org/viewvc/brasero?rev=1706&view=rev
Log:
2009-01-07 Philippe Rouquier <ykw localhost localdomain>
Moved the new library to its directory
Also some fixes for proper building
* Makefile.am:
* brasero-media/Makefile.am:
* configure.in:
* docs/reference/Makefile.am:
* src/Makefile.am:
* src/brasero-medium-selection.c:
* src/brasero-medium-selection.h:
* src/burn-basics.c (brasero_burn_library_shutdown):
* src/burn-drive.c:
* src/burn-drive.h:
* src/burn-hal-watch.c:
* src/burn-hal-watch.h:
* src/burn-iso-field.c:
* src/burn-iso-field.h:
* src/burn-iso9660.c:
* src/burn-iso9660.h:
* src/burn-media.c:
* src/burn-media.h:
* src/burn-medium-monitor.c:
* src/burn-medium-monitor.h:
* src/burn-medium.c:
* src/burn-medium.h:
* src/burn-susp.c:
* src/burn-susp.h:
* src/burn-units.c:
* src/burn-units.h:
* src/burn-volume-obj.c:
* src/burn-volume-obj.h:
* src/burn-volume-source.c:
* src/burn-volume-source.h:
* src/burn-volume.c:
* src/burn-volume.h:
* src/libbrasero-marshal.list:
* src/plugins/cdrdao/Makefile.am:
* src/plugins/cdrkit/Makefile.am:
* src/plugins/cdrtools/Makefile.am:
* src/plugins/checksum/Makefile.am:
* src/plugins/dvdauthor/Makefile.am:
* src/plugins/dvdcss/Makefile.am:
* src/plugins/growisofs/Makefile.am:
* src/plugins/libburnia/Makefile.am:
* src/plugins/local-track/Makefile.am:
* src/plugins/transcode/Makefile.am:
* src/plugins/vcdimager/Makefile.am:
* src/scsi-base.h:
* src/scsi-cam.c:
* src/scsi-command.h:
* src/scsi-device.h:
* src/scsi-dvd-structures.h:
* src/scsi-eject.c:
* src/scsi-error.c:
* src/scsi-error.h:
* src/scsi-get-configuration.c:
* src/scsi-get-configuration.h:
* src/scsi-get-performance.c:
* src/scsi-get-performance.h:
* src/scsi-mech-status.c:
* src/scsi-mech-status.h:
* src/scsi-mmc1.h:
* src/scsi-mmc2.h:
* src/scsi-mmc3.h:
* src/scsi-mode-pages.h:
* src/scsi-mode-select.c:
* src/scsi-mode-sense.c:
* src/scsi-opcodes.h:
* src/scsi-q-subchannel.h:
* src/scsi-read-capacity.c:
* src/scsi-read-capacity.h:
* src/scsi-read-cd.c:
* src/scsi-read-cd.h:
* src/scsi-read-disc-info.c:
* src/scsi-read-disc-info.h:
* src/scsi-read-disc-structure.c:
* src/scsi-read-disc-structure.h:
* src/scsi-read-format-capacities.c:
* src/scsi-read-format-capacities.h:
* src/scsi-read-toc-pma-atip.c:
* src/scsi-read-toc-pma-atip.h:
* src/scsi-read-track-information.c:
* src/scsi-read-track-information.h:
* src/scsi-read10.c:
* src/scsi-sbc.h:
* src/scsi-sense-data.c:
* src/scsi-sense-data.h:
* src/scsi-sg.c:
* src/scsi-spc1.h:
* src/scsi-status-page.h:
* src/scsi-test-unit-ready.c:
* src/scsi-uscsi.c:
* src/scsi-utils.h:
* src/scsi-write-page.h:
Added:
trunk/brasero-media/
trunk/brasero-media/Makefile.am
trunk/brasero-media/brasero-medium-selection.c (props changed)
- copied unchanged from r1704, /trunk/src/brasero-medium-selection.c
trunk/brasero-media/brasero-medium-selection.h (props changed)
- copied unchanged from r1704, /trunk/src/brasero-medium-selection.h
trunk/brasero-media/burn-drive.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-drive.c
trunk/brasero-media/burn-drive.h (props changed)
- copied unchanged from r1704, /trunk/src/burn-drive.h
trunk/brasero-media/burn-hal-watch.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-hal-watch.c
trunk/brasero-media/burn-hal-watch.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-hal-watch.h
trunk/brasero-media/burn-iso-field.c (props changed)
- copied unchanged from r1700, /trunk/src/burn-iso-field.c
trunk/brasero-media/burn-iso-field.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-iso-field.h
trunk/brasero-media/burn-iso9660.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-iso9660.c
trunk/brasero-media/burn-iso9660.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-iso9660.h
trunk/brasero-media/burn-media.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-media.c
trunk/brasero-media/burn-media.h (props changed)
- copied unchanged from r1704, /trunk/src/burn-media.h
trunk/brasero-media/burn-medium-monitor.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-medium-monitor.c
trunk/brasero-media/burn-medium-monitor.h (props changed)
- copied unchanged from r1704, /trunk/src/burn-medium-monitor.h
trunk/brasero-media/burn-medium.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-medium.c
trunk/brasero-media/burn-medium.h (props changed)
- copied unchanged from r1704, /trunk/src/burn-medium.h
trunk/brasero-media/burn-susp.c (props changed)
- copied unchanged from r1700, /trunk/src/burn-susp.c
trunk/brasero-media/burn-susp.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-susp.h
trunk/brasero-media/burn-units.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-units.c
trunk/brasero-media/burn-units.h (props changed)
- copied unchanged from r1704, /trunk/src/burn-units.h
trunk/brasero-media/burn-volume-obj.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-volume-obj.c
trunk/brasero-media/burn-volume-obj.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-volume-obj.h
trunk/brasero-media/burn-volume-source.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-volume-source.c
trunk/brasero-media/burn-volume-source.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-volume-source.h
trunk/brasero-media/burn-volume.c (props changed)
- copied unchanged from r1704, /trunk/src/burn-volume.c
trunk/brasero-media/burn-volume.h (props changed)
- copied unchanged from r1700, /trunk/src/burn-volume.h
trunk/brasero-media/libbrasero-marshal.list (props changed)
- copied unchanged from r1704, /trunk/src/libbrasero-marshal.list
trunk/brasero-media/scsi-base.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-base.h
trunk/brasero-media/scsi-cam.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-cam.c
trunk/brasero-media/scsi-command.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-command.h
trunk/brasero-media/scsi-device.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-device.h
trunk/brasero-media/scsi-dvd-structures.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-dvd-structures.h
trunk/brasero-media/scsi-eject.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-eject.c
trunk/brasero-media/scsi-error.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-error.c
trunk/brasero-media/scsi-error.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-error.h
trunk/brasero-media/scsi-get-configuration.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-get-configuration.c
trunk/brasero-media/scsi-get-configuration.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-get-configuration.h
trunk/brasero-media/scsi-get-performance.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-get-performance.c
trunk/brasero-media/scsi-get-performance.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-get-performance.h
trunk/brasero-media/scsi-mech-status.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mech-status.c
trunk/brasero-media/scsi-mech-status.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mech-status.h
trunk/brasero-media/scsi-mmc1.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mmc1.h
trunk/brasero-media/scsi-mmc2.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mmc2.h
trunk/brasero-media/scsi-mmc3.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mmc3.h
trunk/brasero-media/scsi-mode-pages.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mode-pages.h
trunk/brasero-media/scsi-mode-select.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-mode-select.c
trunk/brasero-media/scsi-mode-sense.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-mode-sense.c
trunk/brasero-media/scsi-opcodes.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-opcodes.h
trunk/brasero-media/scsi-q-subchannel.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-q-subchannel.h
trunk/brasero-media/scsi-read-capacity.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-capacity.c
trunk/brasero-media/scsi-read-capacity.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-capacity.h
trunk/brasero-media/scsi-read-cd.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-cd.c
trunk/brasero-media/scsi-read-cd.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-cd.h
trunk/brasero-media/scsi-read-disc-info.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-read-disc-info.c
trunk/brasero-media/scsi-read-disc-info.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-disc-info.h
trunk/brasero-media/scsi-read-disc-structure.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-disc-structure.c
trunk/brasero-media/scsi-read-disc-structure.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-disc-structure.h
trunk/brasero-media/scsi-read-format-capacities.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-format-capacities.c
trunk/brasero-media/scsi-read-format-capacities.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-format-capacities.h
trunk/brasero-media/scsi-read-toc-pma-atip.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-read-toc-pma-atip.c
trunk/brasero-media/scsi-read-toc-pma-atip.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-toc-pma-atip.h
trunk/brasero-media/scsi-read-track-information.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-read-track-information.c
trunk/brasero-media/scsi-read-track-information.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read-track-information.h
trunk/brasero-media/scsi-read10.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-read10.c
trunk/brasero-media/scsi-sbc.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-sbc.h
trunk/brasero-media/scsi-sense-data.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-sense-data.c
trunk/brasero-media/scsi-sense-data.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-sense-data.h
trunk/brasero-media/scsi-sg.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-sg.c
trunk/brasero-media/scsi-spc1.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-spc1.h
trunk/brasero-media/scsi-status-page.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-status-page.h
trunk/brasero-media/scsi-test-unit-ready.c (props changed)
- copied unchanged from r1700, /trunk/src/scsi-test-unit-ready.c
trunk/brasero-media/scsi-uscsi.c (props changed)
- copied unchanged from r1704, /trunk/src/scsi-uscsi.c
trunk/brasero-media/scsi-utils.h (props changed)
- copied unchanged from r1704, /trunk/src/scsi-utils.h
trunk/brasero-media/scsi-write-page.h (props changed)
- copied unchanged from r1700, /trunk/src/scsi-write-page.h
Removed:
trunk/src/brasero-medium-selection.c
trunk/src/brasero-medium-selection.h
trunk/src/burn-drive.c
trunk/src/burn-drive.h
trunk/src/burn-hal-watch.c
trunk/src/burn-hal-watch.h
trunk/src/burn-iso-field.c
trunk/src/burn-iso-field.h
trunk/src/burn-iso9660.c
trunk/src/burn-iso9660.h
trunk/src/burn-media.c
trunk/src/burn-media.h
trunk/src/burn-medium-monitor.c
trunk/src/burn-medium-monitor.h
trunk/src/burn-medium.c
trunk/src/burn-medium.h
trunk/src/burn-susp.c
trunk/src/burn-susp.h
trunk/src/burn-units.c
trunk/src/burn-units.h
trunk/src/burn-volume-obj.c
trunk/src/burn-volume-obj.h
trunk/src/burn-volume-source.c
trunk/src/burn-volume-source.h
trunk/src/burn-volume.c
trunk/src/burn-volume.h
trunk/src/libbrasero-marshal.list
trunk/src/scsi-base.h
trunk/src/scsi-cam.c
trunk/src/scsi-command.h
trunk/src/scsi-device.h
trunk/src/scsi-dvd-structures.h
trunk/src/scsi-eject.c
trunk/src/scsi-error.c
trunk/src/scsi-error.h
trunk/src/scsi-get-configuration.c
trunk/src/scsi-get-configuration.h
trunk/src/scsi-get-performance.c
trunk/src/scsi-get-performance.h
trunk/src/scsi-mech-status.c
trunk/src/scsi-mech-status.h
trunk/src/scsi-mmc1.h
trunk/src/scsi-mmc2.h
trunk/src/scsi-mmc3.h
trunk/src/scsi-mode-pages.h
trunk/src/scsi-mode-select.c
trunk/src/scsi-mode-sense.c
trunk/src/scsi-opcodes.h
trunk/src/scsi-q-subchannel.h
trunk/src/scsi-read-capacity.c
trunk/src/scsi-read-capacity.h
trunk/src/scsi-read-cd.c
trunk/src/scsi-read-cd.h
trunk/src/scsi-read-disc-info.c
trunk/src/scsi-read-disc-info.h
trunk/src/scsi-read-disc-structure.c
trunk/src/scsi-read-disc-structure.h
trunk/src/scsi-read-format-capacities.c
trunk/src/scsi-read-format-capacities.h
trunk/src/scsi-read-toc-pma-atip.c
trunk/src/scsi-read-toc-pma-atip.h
trunk/src/scsi-read-track-information.c
trunk/src/scsi-read-track-information.h
trunk/src/scsi-read10.c
trunk/src/scsi-sbc.h
trunk/src/scsi-sense-data.c
trunk/src/scsi-sense-data.h
trunk/src/scsi-sg.c
trunk/src/scsi-spc1.h
trunk/src/scsi-status-page.h
trunk/src/scsi-test-unit-ready.c
trunk/src/scsi-uscsi.c
trunk/src/scsi-utils.h
trunk/src/scsi-write-page.h
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.in
trunk/docs/reference/Makefile.am
trunk/src/Makefile.am
trunk/src/burn-basics.c
trunk/src/plugins/cdrdao/Makefile.am
trunk/src/plugins/cdrkit/Makefile.am
trunk/src/plugins/cdrtools/Makefile.am
trunk/src/plugins/checksum/Makefile.am
trunk/src/plugins/dvdauthor/Makefile.am
trunk/src/plugins/dvdcss/Makefile.am
trunk/src/plugins/growisofs/Makefile.am
trunk/src/plugins/libburnia/Makefile.am
trunk/src/plugins/local-track/Makefile.am
trunk/src/plugins/transcode/Makefile.am
trunk/src/plugins/vcdimager/Makefile.am
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in.
-SUBDIRS = src po data docs
+SUBDIRS = src po data docs brasero-media
SUBDIRS += help
Added: trunk/brasero-media/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/brasero-media/Makefile.am Wed Jan 7 19:22:02 2009
@@ -0,0 +1,148 @@
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
+ -I$(top_srcdir)/src/ \
+ -I$(top_builddir) \
+ -DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DBRASERO_PREFIX=\"$(prefix)\" \
+ -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DBRASERO_DATADIR=\"$(datadir)/brasero\" \
+ -DBRASERO_LIBDIR=\"$(libdir)\" \
+ $(DISABLE_DEPRECATED) \
+ $(BRASERO_GLIB_CFLAGS) \
+ $(BRASERO_GIO_CFLAGS) \
+ $(BRASERO_GTK_CFLAGS) \
+ $(BRASERO_DBUS_CFLAGS) \
+ $(BRASERO_HAL_CFLAGS)
+
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+RECMARSHALFILES = libbrasero-marshal.h libbrasero-marshal.c
+
+libbrasero-marshal.h: libbrasero-marshal.list
+ ( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --header > libbrasero-marshal.h )
+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
+
+libbraseromediaincludedir = $(pkgincludedir)/
+libbraseromediainclude_HEADERS = \
+ burn-drive.h \
+ burn-medium-monitor.h \
+ burn-media.h \
+ burn-units.h \
+ burn-medium.h \
+ burn-volume-obj.h \
+ brasero-medium-selection.h
+
+libbrasero_media_la_LIBADD = \
+ $(BRASERO_GLIB_LIBS) \
+ $(BRASERO_GIO_LIBS) \
+ $(BRASERO_GTK_LIBS) \
+ $(BRASERO_DBUS_LIBS) \
+ $(BRASERO_HAL_LIBS)
+
+libbrasero_media_la_LDFLAGS = \
+ -version-info $(LIBBRASERO_LT_VERSION) \
+ -no-undefined \
+ $(AM_LDFLAGS)
+# -export-symbols $(srcdir)/libbrasero-media.symbols
+
+libbrasero_media_la_SOURCES = \
+ libbrasero-marshal.c \
+ libbrasero-marshal.h \
+ burn-drive.h \
+ burn-medium-monitor.h \
+ burn-media.h \
+ burn-units.h \
+ burn-medium.h \
+ burn-volume-obj.h \
+ brasero-medium-selection.h \
+ scsi-base.h \
+ scsi-command.h \
+ scsi-error.h \
+ scsi-get-configuration.c \
+ scsi-get-configuration.h \
+ scsi-mmc1.h \
+ scsi-mmc2.h \
+ scsi-opcodes.h \
+ scsi-read-disc-info.c \
+ scsi-read-disc-info.h \
+ scsi-read-toc-pma-atip.c \
+ scsi-read-toc-pma-atip.h \
+ scsi-sense-data.c \
+ scsi-sense-data.h \
+ scsi-utils.h \
+ scsi-q-subchannel.h \
+ scsi-error.c \
+ scsi-read-track-information.c \
+ scsi-read-track-information.h \
+ scsi-get-performance.c \
+ scsi-get-performance.h \
+ scsi-mmc3.h \
+ scsi-mode-pages.h \
+ scsi-mode-sense.c \
+ scsi-status-page.h \
+ scsi-spc1.h \
+ scsi-read-capacity.c \
+ scsi-read-capacity.h \
+ scsi-read-disc-structure.c \
+ scsi-read-disc-structure.h \
+ scsi-dvd-structures.h \
+ scsi-read-format-capacities.c \
+ scsi-read-format-capacities.h \
+ scsi-read-cd.h \
+ scsi-read-cd.c \
+ scsi-device.h \
+ scsi-eject.c \
+ scsi-mech-status.c \
+ scsi-mech-status.h \
+ scsi-write-page.h \
+ scsi-mode-select.c \
+ scsi-read10.c \
+ scsi-sbc.h \
+ scsi-test-unit-ready.c \
+ burn-media.c \
+ burn-hal-watch.c \
+ burn-hal-watch.h \
+ burn-medium-monitor.c \
+ burn-susp.c \
+ burn-susp.h \
+ burn-iso-field.c \
+ burn-iso-field.h \
+ burn-iso9660.c \
+ burn-iso9660.h \
+ burn-volume-source.c \
+ burn-volume-source.h \
+ burn-volume.c \
+ burn-volume.h \
+ burn-medium.c \
+ burn-volume-obj.c \
+ burn-drive.c \
+ brasero-medium-selection.c \
+ burn-units.c
+
+# FreeBSD's SCSI CAM interface
+if HAVE_CAM_LIB_H
+libbrasero_media_la_SOURCES += scsi-cam.c
+endif
+
+# Linux's SCSI CAM interface
+if HAVE_SG_IO_HDR_T
+libbrasero_media_la_SOURCES += scsi-sg.c
+endif
+
+# Solaris's USCSI interface
+if HAVE_USCSI_H
+libbrasero_media_la_SOURCES += scsi-uscsi.c
+endif
+
+EXTRA_DIST = \
+ libbrasero-marshal.list \
+ libbrasero-media.symbols
+
+CLEANFILES = \
+ $(RECMARSHALFILES)
+
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jan 7 19:22:02 2009
@@ -174,6 +174,12 @@
AC_SUBST(BRASERO_GTK_CFLAGS)
AC_SUBST(BRASERO_GTK_LIBS)
+PKG_CHECK_MODULES(BRASERO_DBUS, \
+ dbus-glib-1 >= $DBUS_REQUIRED)
+
+AC_SUBST(BRASERO_DBUS_CFLAGS)
+AC_SUBST(BRASERO_DBUS_LIBS)
+
PKG_CHECK_MODULES(BRASERO_HAL, \
hal >= $HAL_REQUIRED \
dbus-glib-1 >= $DBUS_REQUIRED)
@@ -412,6 +418,7 @@
data/icons/Makefile
help/Makefile
nautilus/Makefile
+brasero-media/Makefile
src/plugins/Makefile
src/plugins/cdrdao/Makefile
src/plugins/cdrkit/Makefile
Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am (original)
+++ trunk/docs/reference/Makefile.am Wed Jan 7 19:22:02 2009
@@ -18,7 +18,7 @@
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../src
+DOC_SOURCE_DIR=../../brasero-media
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
@@ -42,12 +42,44 @@
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.c
+HFILE_GLOB=$(top_srcdir)/brasero-media/*.h
+CFILE_GLOB=$(top_srcdir)/brasero-media/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
+IGNORE_HFILES= scsi-base.h \
+ scsi-error.h \
+ scsi-mmc1.h \
+ scsi-opcodes.h \
+ scsi-read-disc-info.h \
+ scsi-read-track-information.h \
+ scsi-status-page.h \
+ scsi-command.h \
+ scsi-get-configuration.h \
+ scsi-mmc2.h \
+ scsi-q-subchannel.h \
+ scsi-read-disc-structure.h \
+ scsi-sbc.h \
+ scsi-utils.h \
+ scsi-device.h \
+ scsi-get-performance.h \
+ scsi-mmc3.h \
+ scsi-read-capacity.h \
+ scsi-read-format-capacities.h \
+ scsi-sense-data.h \
+ scsi-write-page.h \
+ scsi-dvd-structures.h \
+ scsi-mech-status.h \
+ scsi-mode-pages.h \
+ scsi-read-cd.h \
+ scsi-read-toc-pma-atip.h \
+ scsi-spc1.h \
+ burn-iso-field.h \
+ burn-iso9660.h \
+ burn-volume.h \
+ burn-susp.h \
+ burn-hal-watch.h \
+ libbrasero-marshal.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
@@ -67,12 +99,16 @@
# signals and properties.
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES= \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(BRASERO_CFLAGS)
+INCLUDES= \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(BRASERO_GLIB_CFLAGS) \
+ $(BRASERO_IO_CFLAGS) \
+ $(BRASERO_GTK_CFLAGS) \
+ $(BRASERO_DBUS_CFLAGS) \
+ $(BRASERO_HAL_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/src/libbrasero.la
+GTKDOC_LIBS=$(top_builddir)/brasero-media/libbrasero-media.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Jan 7 19:22:02 2009
@@ -2,6 +2,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
@@ -10,146 +11,26 @@
-DBRASERO_LIBDIR=\"$(libdir)\" \
$(DISABLE_DEPRECATED) \
$(BRASERO_GLIB_CFLAGS) \
- $(BRASERO_IO_CFLAGS) \
+ $(BRASERO_GIO_CFLAGS) \
$(BRASERO_GCONF_CFLAGS) \
$(BRASERO_GSTREAMER_CFLAGS) \
$(BRASERO_GSTREAMER_BASE_CFLAGS) \
$(BRASERO_SM_CFLAGS) \
$(BRASERO_GTK_CFLAGS) \
+ $(BRASERO_DBUS_CFLAGS) \
$(BRASERO_GMODULE_CFLAGS) \
- $(BRASERO_HAL_CFLAGS) \
$(BRASERO_LIBXML_CFLAGS) \
$(BRASERO_BEAGLE_CFLAGS) \
$(BRASERO_PL_PARSER_CFLAGS)
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-RECMARSHALFILES = brasero-marshal.h brasero-marshal.c libbrasero-marshal.h libbrasero-marshal.c
+RECMARSHALFILES = brasero-marshal.h brasero-marshal.c
brasero-marshal.h: brasero-marshal.list
( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/brasero-marshal.list --header > brasero-marshal.h )
brasero-marshal.c: brasero-marshal.h
( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/brasero-marshal.list --body --header > brasero-marshal.c )
-libbrasero-marshal.h: libbrasero-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=brasero_marshal $(srcdir)/libbrasero-marshal.list --header > libbrasero-marshal.h )
-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
-
-libbraseromediaincludedir = $(pkgincludedir)/
-libbraseromediainclude_HEADERS = \
- burn-drive.h \
- burn-medium-monitor.h \
- burn-media.h \
- burn-units.h \
- burn-medium.h \
- burn-volume-obj.h \
- brasero-medium-selection.h
-
-libbrasero_media_la_LADD = \
- $(BRASERO_GLIB_LIBS) \
- $(BRASERO_IO_LIBS) \
- $(BRASERO_GTK_LIBS) \
- $(BRASERO_HAL_LIBS) \
- -version-info $(LIBBRASERO_LT_VERSION) \
- -export-symbols $(srcdir)/libbrasero_drive.symbols \
- -no-undefined \
- $(AM_LDFLAGS)
-
-libbrasero_media_la_SOURCES = \
- libbrasero-marshal.c \
- libbrasero-marshal.h \
- burn-drive.h \
- burn-medium-monitor.h \
- burn-media.h \
- burn-units.h \
- burn-medium.h \
- burn-volume-obj.h \
- brasero-medium-selection.h \
- scsi-base.h \
- scsi-command.h \
- scsi-error.h \
- scsi-get-configuration.c \
- scsi-get-configuration.h \
- scsi-mmc1.h \
- scsi-mmc2.h \
- scsi-opcodes.h \
- scsi-read-disc-info.c \
- scsi-read-disc-info.h \
- scsi-read-toc-pma-atip.c \
- scsi-read-toc-pma-atip.h \
- scsi-sense-data.c \
- scsi-sense-data.h \
- scsi-utils.h \
- scsi-q-subchannel.h \
- scsi-error.c \
- scsi-read-track-information.c \
- scsi-read-track-information.h \
- scsi-get-performance.c \
- scsi-get-performance.h \
- scsi-mmc3.h \
- scsi-mode-pages.h \
- scsi-mode-sense.c \
- scsi-status-page.h \
- scsi-spc1.h \
- scsi-read-capacity.c \
- scsi-read-capacity.h \
- scsi-read-disc-structure.c \
- scsi-read-disc-structure.h \
- scsi-dvd-structures.h \
- scsi-read-format-capacities.c \
- scsi-read-format-capacities.h \
- scsi-read-cd.h \
- scsi-read-cd.c \
- scsi-device.h \
- scsi-eject.c \
- scsi-mech-status.c \
- scsi-mech-status.h \
- scsi-write-page.h \
- scsi-mode-select.c \
- scsi-read10.c \
- scsi-sbc.h \
- scsi-test-unit-ready.c \
- burn-media.c \
- burn-hal-watch.c \
- burn-hal-watch.h \
- burn-medium-monitor.c \
- burn-susp.c \
- burn-susp.h \
- burn-iso-field.c \
- burn-iso-field.h \
- burn-iso9660.c \
- burn-iso9660.h \
- burn-volume-source.c \
- burn-volume-source.h \
- burn-volume.c \
- burn-volume.h \
- burn-medium.c \
- burn-volume-obj.c \
- burn-drive.c \
- brasero-medium-selection.c \
- burn-units.c
-
-# FreeBSD's SCSI CAM interface
-if HAVE_CAM_LIB_H
-libbrasero_media_la_SOURCES += scsi-cam.c
-endif
-
-# Linux's SCSI CAM interface
-if HAVE_SG_IO_HDR_T
-libbrasero_media_la_SOURCES += scsi-sg.c
-endif
-
-# Solaris's USCSI interface
-if HAVE_USCSI_H
-libbrasero_media_la_SOURCES += scsi-uscsi.c
-endif
-
-
-
-
bin_PROGRAMS = brasero
brasero_SOURCES = \
@@ -349,20 +230,20 @@
brasero_LDADD = \
libbrasero-media.la \
$(BRASERO_GLIB_LIBS) \
- $(BRASERO_IO_LIBS) \
+ $(BRASERO_GIO_LIBS) \
$(BRASERO_GCONF_LIBS) \
$(BRASERO_GSTREAMER_LIBS) \
$(BRASERO_GSTREAMER_BASE_LIBS) \
$(BRASERO_SM_LIBS) \
$(BRASERO_GTK_LIBS) \
$(BRASERO_GMODULE_LIBS) \
+ $(BRASERO_DBUS_LIBS) \
$(BRASERO_LIBXML_LIBS) \
$(BRASERO_BEAGLE_LIBS) \
$(BRASERO_PL_PARSER_LIBS)
EXTRA_DIST = \
brasero-marshal.list \
- libbrasero-marshal.list \
libbrasero.symbols
CLEANFILES = \
Modified: trunk/src/burn-basics.c
==============================================================================
--- trunk/src/burn-basics.c (original)
+++ trunk/src/burn-basics.c Wed Jan 7 19:22:02 2009
@@ -37,7 +37,6 @@
#include "burn-basics.h"
#include "burn-debug.h"
#include "burn-caps.h"
-#include "burn-hal-watch.h"
#include "burn-plugin-manager.h"
#include "burn-medium-monitor.h"
#include "burn-plugin-private.h"
@@ -129,5 +128,5 @@
}
/* close HAL connection */
- brasero_hal_watch_destroy ();
+// brasero_hal_watch_destroy ();
}
Modified: trunk/src/plugins/cdrdao/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrdao/Makefile.am (original)
+++ trunk/src/plugins/cdrdao/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/cdrkit/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrkit/Makefile.am (original)
+++ trunk/src/plugins/cdrkit/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/cdrtools/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrtools/Makefile.am (original)
+++ trunk/src/plugins/cdrtools/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/checksum/Makefile.am
==============================================================================
--- trunk/src/plugins/checksum/Makefile.am (original)
+++ trunk/src/plugins/checksum/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,9 +1,9 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/md5 \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/src/plugins/dvdauthor/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdauthor/Makefile.am (original)
+++ trunk/src/plugins/dvdauthor/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/dvdcss/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdcss/Makefile.am (original)
+++ trunk/src/plugins/dvdcss/Makefile.am Wed Jan 7 19:22:02 2009
@@ -2,6 +2,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/growisofs/Makefile.am
==============================================================================
--- trunk/src/plugins/growisofs/Makefile.am (original)
+++ trunk/src/plugins/growisofs/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/libburnia/Makefile.am
==============================================================================
--- trunk/src/plugins/libburnia/Makefile.am (original)
+++ trunk/src/plugins/libburnia/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/local-track/Makefile.am
==============================================================================
--- trunk/src/plugins/local-track/Makefile.am (original)
+++ trunk/src/plugins/local-track/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,9 +1,9 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/md5/ \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\" \
Modified: trunk/src/plugins/transcode/Makefile.am
==============================================================================
--- trunk/src/plugins/transcode/Makefile.am (original)
+++ trunk/src/plugins/transcode/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/src/plugins/vcdimager/Makefile.am
==============================================================================
--- trunk/src/plugins/vcdimager/Makefile.am (original)
+++ trunk/src/plugins/vcdimager/Makefile.am Wed Jan 7 19:22:02 2009
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/brasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
