[nautilus] build: use GNOME_MAINTAINER_MODE_DEFINES
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] build: use GNOME_MAINTAINER_MODE_DEFINES
- Date: Wed, 24 Oct 2012 00:10:19 +0000 (UTC)
commit c6a1bf5fa5ddfb39fdc7ede0c8df9ae255b0a0f0
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Oct 23 18:18:46 2012 -0400
build: use GNOME_MAINTAINER_MODE_DEFINES
Instead of defining our own set of deprecation cflags.
configure.in | 4 +---
docs/reference/libnautilus-extension/Makefile.am | 4 ----
eel/Makefile.am | 2 +-
libnautilus-extension/Makefile.am | 2 +-
libnautilus-private/Makefile.am | 2 +-
nautilus-sendto-extension/Makefile.am | 2 +-
src/Makefile.am | 2 +-
7 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/configure.in b/configure.in
index 48cd245..dcf01bc 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable])
+GNOME_MAINTAINER_MODE_DEFINES
dnl We need to decrement current by one in the calculation of the age because
dnl the library was started with version "1:0:0" instead of "0:0:0"
@@ -288,9 +289,6 @@ PKG_CHECK_MODULES(NAUTILUS, [
AC_SUBST(NAUTILUS_CFLAGS)
AC_SUBST(NAUTILUS_LIBS)
-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
-AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-
dnl Multimedia keys
AC_CHECK_HEADERS([X11/XF86keysym.h])
diff --git a/docs/reference/libnautilus-extension/Makefile.am b/docs/reference/libnautilus-extension/Makefile.am
index 0434243..5e69b07 100644
--- a/docs/reference/libnautilus-extension/Makefile.am
+++ b/docs/reference/libnautilus-extension/Makefile.am
@@ -18,10 +18,6 @@ DOC_SOURCE_DIR=$(top_srcdir)/libnautilus-extension
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
-
# Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/eel/Makefile.am b/eel/Makefile.am
index 5ffbb0a..c14ccc5 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(WARNING_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \
-DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
index a568e9f..17af474 100644
--- a/libnautilus-extension/Makefile.am
+++ b/libnautilus-extension/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES=\
-I$(top_builddir) \
$(BASE_CFLAGS) \
$(WARNING_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \
$(NULL)
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 0a35e81..18f0f95 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(TRACKER_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
index 314369d..fde6c30 100644
--- a/nautilus-sendto-extension/Makefile.am
+++ b/nautilus-sendto-extension/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES=\
-I$(top_builddir) \
$(BASE_CFLAGS) \
$(WARNING_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \
$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index f3a0ed4..eddc7f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ INCLUDES = \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DVERSION="\"$(VERSION)\"" \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
$(NULL)
LDADD =\
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]