Commit c6a1bf5f authored by Cosimo Cecchi's avatar Cosimo Cecchi

build: use GNOME_MAINTAINER_MODE_DEFINES

Instead of defining our own set of deprecation cflags.
parent 86bfd968
...@@ -29,6 +29,7 @@ AC_CONFIG_MACRO_DIR([m4]) ...@@ -29,6 +29,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar]) AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
GNOME_MAINTAINER_MODE_DEFINES
dnl We need to decrement current by one in the calculation of the age because 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" dnl the library was started with version "1:0:0" instead of "0:0:0"
...@@ -288,9 +289,6 @@ PKG_CHECK_MODULES(NAUTILUS, [ ...@@ -288,9 +289,6 @@ PKG_CHECK_MODULES(NAUTILUS, [
AC_SUBST(NAUTILUS_CFLAGS) AC_SUBST(NAUTILUS_CFLAGS)
AC_SUBST(NAUTILUS_LIBS) 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 dnl Multimedia keys
AC_CHECK_HEADERS([X11/XF86keysym.h]) AC_CHECK_HEADERS([X11/XF86keysym.h])
......
...@@ -18,10 +18,6 @@ DOC_SOURCE_DIR=$(top_srcdir)/libnautilus-extension ...@@ -18,10 +18,6 @@ DOC_SOURCE_DIR=$(top_srcdir)/libnautilus-extension
# Extra options to pass to gtkdoc-scangobj. Not normally needed. # Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=--type-init-func="g_type_init()" 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. # Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--sgml-mode --output-format=xml MKDB_OPTIONS=--sgml-mode --output-format=xml
......
...@@ -9,7 +9,7 @@ INCLUDES = \ ...@@ -9,7 +9,7 @@ INCLUDES = \
$(BASE_CFLAGS) \ $(BASE_CFLAGS) \
$(COMMON_CFLAGS) \ $(COMMON_CFLAGS) \
$(WARNING_CFLAGS) \ $(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
-DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
......
...@@ -9,7 +9,7 @@ INCLUDES=\ ...@@ -9,7 +9,7 @@ INCLUDES=\
-I$(top_builddir) \ -I$(top_builddir) \
$(BASE_CFLAGS) \ $(BASE_CFLAGS) \
$(WARNING_CFLAGS) \ $(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(NULL) $(NULL)
......
...@@ -10,7 +10,7 @@ INCLUDES = \ ...@@ -10,7 +10,7 @@ INCLUDES = \
$(COMMON_CFLAGS) \ $(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \ $(NAUTILUS_CFLAGS) \
$(WARNING_CFLAGS) \ $(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED) \
$(TRACKER_CFLAGS) \ $(TRACKER_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \
......
...@@ -5,7 +5,7 @@ INCLUDES=\ ...@@ -5,7 +5,7 @@ INCLUDES=\
-I$(top_builddir) \ -I$(top_builddir) \
$(BASE_CFLAGS) \ $(BASE_CFLAGS) \
$(WARNING_CFLAGS) \ $(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(NULL) $(NULL)
......
...@@ -30,7 +30,7 @@ INCLUDES = \ ...@@ -30,7 +30,7 @@ INCLUDES = \
-DPREFIX=\""$(prefix)"\" \ -DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \
-DVERSION="\"$(VERSION)\"" \ -DVERSION="\"$(VERSION)\"" \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED) \
$(NULL) $(NULL)
LDADD =\ LDADD =\
......
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