Commit 7fc508f7 authored by Philippe Rouquier's avatar Philippe Rouquier Committed by Philippe Rouquier

Rename brasero-media directory to libbrasero-media and fix a build problem

2009-01-10  Philippe Rouquier  <ykw@localhost.localdomain>

	Rename brasero-media directory to libbrasero-media
	and fix a build problem

	* Makefile.am:
	* brasero-media/Makefile.am:
	* brasero-media/brasero-drive-selection.c:
	* brasero-media/brasero-drive-selection.h:
	* brasero-media/brasero-drive.c:
	* brasero-media/brasero-drive.h:
	* brasero-media/brasero-media.c:
	* brasero-media/brasero-media.h:
	* brasero-media/brasero-medium-monitor.c:
	* brasero-media/brasero-medium-monitor.h:
	* brasero-media/brasero-medium-selection.c:
	* brasero-media/brasero-medium-selection.h:
	* brasero-media/brasero-medium.c:
	* brasero-media/brasero-medium.h:
	* brasero-media/brasero-units.c:
	* brasero-media/brasero-units.h:
	* brasero-media/brasero-volume.c:
	* brasero-media/brasero-volume.h:
	* brasero-media/burn-hal-watch.c:
	* brasero-media/burn-hal-watch.h:
	* brasero-media/burn-iso-field.c:
	* brasero-media/burn-iso-field.h:
	* brasero-media/burn-iso9660.c:
	* brasero-media/burn-iso9660.h:
	* brasero-media/burn-susp.c:
	* brasero-media/burn-susp.h:
	* brasero-media/burn-volume-source.c:
	* brasero-media/burn-volume-source.h:
	* brasero-media/burn-volume.c:
	* brasero-media/burn-volume.h:
	* brasero-media/libbrasero-marshal.list:
	* brasero-media/scsi-base.h:
	* brasero-media/scsi-cam.c:
	* brasero-media/scsi-command.h:
	* brasero-media/scsi-device.h:
	* brasero-media/scsi-dvd-structures.h:
	* brasero-media/scsi-eject.c:
	* brasero-media/scsi-error.c:
	* brasero-media/scsi-error.h:
	* brasero-media/scsi-get-configuration.c:
	* brasero-media/scsi-get-configuration.h:
	* brasero-media/scsi-get-performance.c:
	* brasero-media/scsi-get-performance.h:
	* brasero-media/scsi-mech-status.c:
	* brasero-media/scsi-mech-status.h:
	* brasero-media/scsi-mmc1.h:
	* brasero-media/scsi-mmc2.h:
	* brasero-media/scsi-mmc3.h:
	* brasero-media/scsi-mode-pages.h:
	* brasero-media/scsi-mode-select.c:
	* brasero-media/scsi-mode-sense.c:
	* brasero-media/scsi-opcodes.h:
	* brasero-media/scsi-q-subchannel.h:
	* brasero-media/scsi-read-capacity.c:
	* brasero-media/scsi-read-capacity.h:
	* brasero-media/scsi-read-cd.c:
	* brasero-media/scsi-read-cd.h:
	* brasero-media/scsi-read-disc-info.c:
	* brasero-media/scsi-read-disc-info.h:
	* brasero-media/scsi-read-disc-structure.c:
	* brasero-media/scsi-read-disc-structure.h:
	* brasero-media/scsi-read-format-capacities.c:
	* brasero-media/scsi-read-format-capacities.h:
	* brasero-media/scsi-read-toc-pma-atip.c:
	* brasero-media/scsi-read-toc-pma-atip.h:
	* brasero-media/scsi-read-track-information.c:
	* brasero-media/scsi-read-track-information.h:
	* brasero-media/scsi-read10.c:
	* brasero-media/scsi-sbc.h:
	* brasero-media/scsi-sense-data.c:
	* brasero-media/scsi-sense-data.h:
	* brasero-media/scsi-sg.c:
	* brasero-media/scsi-spc1.h:
	* brasero-media/scsi-status-page.h:
	* brasero-media/scsi-test-unit-ready.c:
	* brasero-media/scsi-uscsi.c:
	* brasero-media/scsi-utils.h:
	* brasero-media/scsi-write-page.h:
	* configure.in:
	* docs/reference/Makefile.am:
	* libbrasero-media/brasero-drive-selection.c:
	* libbrasero-media/brasero-drive-selection.h:
	* src/Makefile.am:
	* 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:

svn path=/trunk/; revision=1725
parent 49beb294
2009-01-10 Philippe Rouquier <ykw@localhost.localdomain>
Rename brasero-media directory to libbrasero-media
and fix a build problem
* Makefile.am:
* brasero-media/Makefile.am:
* brasero-media/brasero-drive-selection.c:
* brasero-media/brasero-drive-selection.h:
* brasero-media/brasero-drive.c:
* brasero-media/brasero-drive.h:
* brasero-media/brasero-media.c:
* brasero-media/brasero-media.h:
* brasero-media/brasero-medium-monitor.c:
* brasero-media/brasero-medium-monitor.h:
* brasero-media/brasero-medium-selection.c:
* brasero-media/brasero-medium-selection.h:
* brasero-media/brasero-medium.c:
* brasero-media/brasero-medium.h:
* brasero-media/brasero-units.c:
* brasero-media/brasero-units.h:
* brasero-media/brasero-volume.c:
* brasero-media/brasero-volume.h:
* brasero-media/burn-hal-watch.c:
* brasero-media/burn-hal-watch.h:
* brasero-media/burn-iso-field.c:
* brasero-media/burn-iso-field.h:
* brasero-media/burn-iso9660.c:
* brasero-media/burn-iso9660.h:
* brasero-media/burn-susp.c:
* brasero-media/burn-susp.h:
* brasero-media/burn-volume-source.c:
* brasero-media/burn-volume-source.h:
* brasero-media/burn-volume.c:
* brasero-media/burn-volume.h:
* brasero-media/libbrasero-marshal.list:
* brasero-media/scsi-base.h:
* brasero-media/scsi-cam.c:
* brasero-media/scsi-command.h:
* brasero-media/scsi-device.h:
* brasero-media/scsi-dvd-structures.h:
* brasero-media/scsi-eject.c:
* brasero-media/scsi-error.c:
* brasero-media/scsi-error.h:
* brasero-media/scsi-get-configuration.c:
* brasero-media/scsi-get-configuration.h:
* brasero-media/scsi-get-performance.c:
* brasero-media/scsi-get-performance.h:
* brasero-media/scsi-mech-status.c:
* brasero-media/scsi-mech-status.h:
* brasero-media/scsi-mmc1.h:
* brasero-media/scsi-mmc2.h:
* brasero-media/scsi-mmc3.h:
* brasero-media/scsi-mode-pages.h:
* brasero-media/scsi-mode-select.c:
* brasero-media/scsi-mode-sense.c:
* brasero-media/scsi-opcodes.h:
* brasero-media/scsi-q-subchannel.h:
* brasero-media/scsi-read-capacity.c:
* brasero-media/scsi-read-capacity.h:
* brasero-media/scsi-read-cd.c:
* brasero-media/scsi-read-cd.h:
* brasero-media/scsi-read-disc-info.c:
* brasero-media/scsi-read-disc-info.h:
* brasero-media/scsi-read-disc-structure.c:
* brasero-media/scsi-read-disc-structure.h:
* brasero-media/scsi-read-format-capacities.c:
* brasero-media/scsi-read-format-capacities.h:
* brasero-media/scsi-read-toc-pma-atip.c:
* brasero-media/scsi-read-toc-pma-atip.h:
* brasero-media/scsi-read-track-information.c:
* brasero-media/scsi-read-track-information.h:
* brasero-media/scsi-read10.c:
* brasero-media/scsi-sbc.h:
* brasero-media/scsi-sense-data.c:
* brasero-media/scsi-sense-data.h:
* brasero-media/scsi-sg.c:
* brasero-media/scsi-spc1.h:
* brasero-media/scsi-status-page.h:
* brasero-media/scsi-test-unit-ready.c:
* brasero-media/scsi-uscsi.c:
* brasero-media/scsi-utils.h:
* brasero-media/scsi-write-page.h:
* configure.in:
* docs/reference/Makefile.am:
* libbrasero-media/brasero-drive-selection.c:
* libbrasero-media/brasero-drive-selection.h:
* src/Makefile.am:
* 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:
2009-01-10 Philippe Rouquier <ykw@localhost.localdomain>
Renamed some header files
......
## Process this file with automake to produce Makefile.in.
SUBDIRS = brasero-media src po data docs
SUBDIRS = libbrasero-media src po data docs
SUBDIRS += help
......
......@@ -418,7 +418,7 @@ data/brasero-copy-medium.desktop.in
data/icons/Makefile
help/Makefile
nautilus/Makefile
brasero-media/Makefile
libbrasero-media/Makefile
src/plugins/Makefile
src/plugins/cdrdao/Makefile
src/plugins/cdrkit/Makefile
......
......@@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# 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=../../brasero-media
DOC_SOURCE_DIR=../../libbrasero-media
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
......@@ -42,8 +42,8 @@ FIXXREF_OPTIONS=
# 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)/brasero-media/*.h
CFILE_GLOB=$(top_srcdir)/brasero-media/*.c
HFILE_GLOB=$(top_srcdir)/libbrasero-media/*.h
CFILE_GLOB=$(top_srcdir)/libbrasero-media/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
......@@ -109,7 +109,7 @@ INCLUDES= \
$(BRASERO_DBUS_CFLAGS) \
$(BRASERO_HAL_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/brasero-media/libbrasero-media.la
GTKDOC_LIBS=$(top_builddir)/libbrasero-media/libbrasero-media.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
......
......@@ -33,8 +33,8 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "brasero-drive-selection.h"
#include "brasero-medium-monitor.h"
#include "brasero-drive-selection.h"
/* Signals */
enum {
......
......@@ -52,7 +52,7 @@ typedef struct {
BraseroDrive *drive);
} BraseroDriveSelectionClass;
GtkType brasero_drive_selection_get_type (void);
GType brasero_drive_selection_get_type (void) G_GNUC_CONST;
GtkWidget *brasero_drive_selection_new (void);
void brasero_drive_selection_set_active (BraseroDriveSelection *selection,
......
2009-01-10 Philippe Rouquier <ykw@localhost.localdomain>
reviewed by: <delete if not using a buddy>
Updated for file moving
* POTFILES.in:
2009-01-10 Philippe Rouquier <ykw@localhost.localdomain>
Updated for file renaming
* POTFILES.in:
......
# List of source files containing translatable strings.
[encoding: UTF-8]
brasero-media/brasero-drive-selection.c
brasero-media/brasero-media.c
brasero-media/brasero-units.c
brasero-media/brasero-medium-selection.c
brasero-media/brasero-drive.c
brasero-media/burn-iso9660.c
brasero-media/brasero-medium.c
brasero-media/brasero-volume.c
brasero-media/burn-volume.c
brasero-media/scsi-error.c
libbrasero-media/brasero-drive-selection.c
libbrasero-media/brasero-media.c
libbrasero-media/brasero-units.c
libbrasero-media/brasero-medium-selection.c
libbrasero-media/brasero-drive.c
libbrasero-media/burn-iso9660.c
libbrasero-media/brasero-medium.c
libbrasero-media/brasero-volume.c
libbrasero-media/burn-volume.c
libbrasero-media/scsi-error.c
src/eggdesktopfile.c
src/eggsmclient.c
src/brasero-tool-color-picker.c
......
......@@ -2,7 +2,7 @@ SUBDIRS = plugins
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DBRASERO_PREFIX=\"$(prefix)\" \
......@@ -228,7 +228,7 @@ brasero_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
endif
brasero_LDADD = \
../brasero-media/libbrasero-media.la \
../libbrasero-media/libbrasero-media.la \
$(BRASERO_GLIB_LIBS) \
$(BRASERO_GIO_LIBS) \
$(BRASERO_GCONF_LIBS) \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
......@@ -2,7 +2,7 @@ plugindir = $(libdir)/brasero/plugins
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/brasero-media/ \
-I$(top_srcdir)/libbrasero-media/ \
-I$(top_builddir) \
-I$(top_srcdir)/src \
-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment