brasero r1584 - in trunk: . nautilus 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



Author: philippr
Date: Sun Nov 30 10:05:51 2008
New Revision: 1584
URL: http://svn.gnome.org/viewvc/brasero?rev=1584&view=rev

Log:
	Fix for #562705 â brasero passes GTK_DISABLE_DEPRECATED and co unconditionally
	Use gnome-common macros to allow use of a maintainer-mode that enables
	all DISABLE-DEPRECATED macros. These macros, that were unconditionally 
	used before, created no future tarballs as they were used in release
	tarballs.

	* configure.in:
	* nautilus/Makefile.am:
	* 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:


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/nautilus/Makefile.am
   trunk/src/Makefile.am
   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/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Nov 30 10:05:51 2008
@@ -31,6 +31,19 @@
 AM_INIT_AUTOMAKE(brasero, $BRASERO_VERSION)
 AM_CONFIG_HEADER(config.h)
 
+AM_MAINTAINER_MODE
+
+
+dnl ***************** GNOME MACROS *****************************
+
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_CXX_WARNINGS
+
+dnl This could be use one day not to compile all debugging message
+dnl GNOME_DEBUG_CHECK
+
+GNOME_MAINTAINER_MODE_DEFINES
+
 dnl ***************** GENERAL **********************************
 
 AC_DISABLE_STATIC

Modified: trunk/nautilus/Makefile.am
==============================================================================
--- trunk/nautilus/Makefile.am	(original)
+++ trunk/nautilus/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -9,10 +9,11 @@
 	-D_REENTRANT				\
 	-D_POSIX_PTHREAD_SEMANTICS		\
 	-DPREFIX=\"$(prefix)\"			\
-	-DBINDIR=\""$(bindir)"\"	\
+	-DBINDIR=\""$(bindir)"\"		\
 	-DLIBEXECDIR=\""$(libexecdir)"\"	\
 	-DSHAREDIR=\""$(datadir)"\"		\
-	-DDATADIR=\""$(datadir)/brasero"\"
+	-DDATADIR=\""$(datadir)/brasero"\"	\
+	$(DISABLE_DEPRECATED)
 
 CLEANFILES = 			\
 	$(NULL)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,9 +1,4 @@
 SUBDIRS = plugins
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED \
-					-DGDK_DISABLE_DEPRECATED \
-					-DGDK_PIXBUF_DISABLE_DEPRECATED \
-					-DGTK_DISABLE_DEPRECATED \
-					-DGNOME_DISABLE_DEPRECATED
 
 INCLUDES = \
 	-I$(top_srcdir)							\
@@ -20,8 +15,6 @@
 EXTRA_DIST = brasero-marshal.list
 CLEANFILES = $(RECMARSHALFILES)
 
-AM_CFLAGS = -g
-
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 RECMARSHALFILES = brasero-marshal.h brasero-marshal.c 
 brasero-marshal.h: brasero-marshal.list

Modified: trunk/src/plugins/cdrdao/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrdao/Makefile.am	(original)
+++ trunk/src/plugins/cdrdao/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -13,8 +11,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 #cdrdao
 cdrdaodir = $(libdir)/brasero/plugins
 cdrdao_LTLIBRARIES = libbrasero-cdrdao.la

Modified: trunk/src/plugins/cdrkit/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrkit/Makefile.am	(original)
+++ trunk/src/plugins/cdrkit/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -13,8 +11,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 #wodim
 wodimdir = $(libdir)/brasero/plugins
 wodim_LTLIBRARIES = libbrasero-wodim.la

Modified: trunk/src/plugins/cdrtools/Makefile.am
==============================================================================
--- trunk/src/plugins/cdrtools/Makefile.am	(original)
+++ trunk/src/plugins/cdrtools/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -13,8 +11,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 #cdrecord
 cdrecorddir = $(libdir)/brasero/plugins
 cdrecord_LTLIBRARIES = libbrasero-cdrecord.la

Modified: trunk/src/plugins/checksum/Makefile.am
==============================================================================
--- trunk/src/plugins/checksum/Makefile.am	(original)
+++ trunk/src/plugins/checksum/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
@@ -14,8 +12,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 checksumdir = $(libdir)/brasero/plugins
 checksum_LTLIBRARIES = libbrasero-checksum.la
 libbrasero_checksum_la_SOURCES = burn-checksum-image.c	\

Modified: trunk/src/plugins/dvdauthor/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdauthor/Makefile.am	(original)
+++ trunk/src/plugins/dvdauthor/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,4 +1,3 @@
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
 
 INCLUDES = \
 	-I$(top_srcdir)					\
@@ -13,8 +12,6 @@
 	$(BRASERO_BASE_CFLAGS)				\
 	$(BRASERO_LIBXML_CFLAGS)
 
-AM_CFLAGS = -g
-
 dvdauthordir = $(libdir)/brasero/plugins
 dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
 

Modified: trunk/src/plugins/dvdcss/Makefile.am
==============================================================================
--- trunk/src/plugins/dvdcss/Makefile.am	(original)
+++ trunk/src/plugins/dvdcss/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,7 +1,5 @@
 plugindir = $(libdir)/brasero/plugins
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -14,8 +12,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 plugin_LTLIBRARIES = libbrasero-dvdcss.la
 
 libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c burn-dvdcss.h \

Modified: trunk/src/plugins/growisofs/Makefile.am
==============================================================================
--- trunk/src/plugins/growisofs/Makefile.am	(original)
+++ trunk/src/plugins/growisofs/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -13,8 +11,6 @@
 	$(DISABLE_DEPRECATED)				\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 #growisofs
 growisofsdir = $(libdir)/brasero/plugins
 growisofs_LTLIBRARIES = libbrasero-growisofs.la

Modified: trunk/src/plugins/libburnia/Makefile.am
==============================================================================
--- trunk/src/plugins/libburnia/Makefile.am	(original)
+++ trunk/src/plugins/libburnia/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,6 +1,4 @@
 
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
-
 INCLUDES = \
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -15,8 +13,6 @@
 	$(BRASERO_LIBBURN_CFLAGS)			\
 	$(BRASERO_BASE_CFLAGS)
 
-AM_CFLAGS = -g
-
 #libburn
 libburndir = $(libdir)/brasero/plugins
 libburn_LTLIBRARIES = libbrasero-libburn.la

Modified: trunk/src/plugins/local-track/Makefile.am
==============================================================================
--- trunk/src/plugins/local-track/Makefile.am	(original)
+++ trunk/src/plugins/local-track/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,4 +1,3 @@
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
 
 INCLUDES = \
 	-I$(top_srcdir)						\
@@ -14,8 +13,6 @@
 	$(BRASERO_BASE_CFLAGS) 			\
 	$(BRASERO_GNOMEVFS_CFLAGS)
 
-AM_CFLAGS = -g
-
 #local-track
 local_trackdir = $(libdir)/brasero/plugins
 local_track_LTLIBRARIES = libbrasero-local-track.la

Modified: trunk/src/plugins/transcode/Makefile.am
==============================================================================
--- trunk/src/plugins/transcode/Makefile.am	(original)
+++ trunk/src/plugins/transcode/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,4 +1,3 @@
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
 
 INCLUDES = \
 	-I$(top_srcdir)					\
@@ -13,8 +12,6 @@
 	$(BRASERO_BASE_CFLAGS)				\
 	$(BRASERO_GSTREAMER_CFLAGS)
 
-AM_CFLAGS = -g
-
 transcodedir = $(libdir)/brasero/plugins
 transcode_LTLIBRARIES = libbrasero-transcode.la
 

Modified: trunk/src/plugins/vcdimager/Makefile.am
==============================================================================
--- trunk/src/plugins/vcdimager/Makefile.am	(original)
+++ trunk/src/plugins/vcdimager/Makefile.am	Sun Nov 30 10:05:51 2008
@@ -1,4 +1,3 @@
-DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED
 
 INCLUDES = \
 	-I$(top_srcdir)					\
@@ -13,8 +12,6 @@
 	$(BRASERO_BASE_CFLAGS)				\
 	$(BRASERO_LIBXML_CFLAGS)
 
-AM_CFLAGS = -g
-
 vcdimagerdir = $(libdir)/brasero/plugins
 vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]