summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-02-10 13:53:05 +0300
committermonsta <[email protected]>2017-02-10 13:53:05 +0300
commitbef73d50f8ec2877c30e4787413cc6fa29276678 (patch)
tree12e5ecc83d96da1917067094c707fe876e602804
parent30cb4f43bc9e121a2a510f8868ec51d75eaebff5 (diff)
downloadpluma-bef73d50f8ec2877c30e4787413cc6fa29276678.tar.bz2
pluma-bef73d50f8ec2877c30e4787413cc6fa29276678.tar.xz
build: remove option that disables deprecated stuff
we don't need a build breakage on the first deprecated item, thanks
-rw-r--r--configure.ac15
-rw-r--r--plugins/changecase/Makefile.am3
-rw-r--r--plugins/docinfo/Makefile.am3
-rw-r--r--plugins/filebrowser/Makefile.am3
-rw-r--r--plugins/modelines/Makefile.am3
-rw-r--r--plugins/sort/Makefile.am3
-rw-r--r--plugins/spell/Makefile.am3
-rw-r--r--plugins/taglist/Makefile.am3
-rw-r--r--plugins/time/Makefile.am3
-rw-r--r--plugins/trailsave/Makefile.am3
-rw-r--r--pluma/Makefile.am1
-rwxr-xr-xpluma/dialogs/Makefile.am3
-rw-r--r--tools/plugin_template/Makefile.am1
13 files changed, 10 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 4b2fbf74..a0ac62e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,21 +203,6 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
MATE_COMPILE_WARNINGS(yes)
-AC_ARG_ENABLE(deprecations,
- [AS_HELP_STRING([--enable-deprecations],
- [warn about deprecated usages [default=no]])],,
- [enable_deprecations=no])
-
-if test "x$enable_deprecations" = "xyes"; then
- DISABLE_DEPRECATED_CFLAGS="\
--DG_DISABLE_DEPRECATED \
--DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED \
--DMATE_DISABLE_DEPRECATED"
- AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
AC_ARG_ENABLE([tests],
AS_HELP_STRING([--enable-tests], [Enable the tests]),
[enable_tests=$enableval],
diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am
index 5cb37347..e1404b1c 100644
--- a/plugins/changecase/Makefile.am
+++ b/plugins/changecase/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libchangecase.la
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index 1e1b48e9..1a6cc931 100644
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libdocinfo.la
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index faa554ec..903e5bc7 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -5,8 +5,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
BUILT_SOURCES = \
pluma-file-browser-enum-types.h \
diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am
index c4840177..5284cf93 100644
--- a/plugins/modelines/Makefile.am
+++ b/plugins/modelines/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
modelinesdir = $(PLUMA_PLUGINS_DATA_DIR)/modelines
modelines_DATA = \
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index 18245f05..1738a50c 100644
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libsort.la
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 9b15bc36..3d2d5f93 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -5,8 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
$(ENCHANT_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
BUILT_SOURCES = \
pluma-spell-marshal.c \
diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am
index 044fae3f..3088ba58 100644
--- a/plugins/taglist/Makefile.am
+++ b/plugins/taglist/Makefile.am
@@ -14,8 +14,7 @@ taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libtaglist.la
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 30363e76..e9b5f329 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libtime.la
diff --git a/plugins/trailsave/Makefile.am b/plugins/trailsave/Makefile.am
index d5879e46..d9ef3225 100644
--- a/plugins/trailsave/Makefile.am
+++ b/plugins/trailsave/Makefile.am
@@ -4,8 +4,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
plugin_LTLIBRARIES = libtrailsave.la
diff --git a/pluma/Makefile.am b/pluma/Makefile.am
index 5a213037..63b91b8e 100644
--- a/pluma/Makefile.am
+++ b/pluma/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
$(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \
$(INTROSPECTION_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"
diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am
index 19a5c18e..7dbada66 100755
--- a/pluma/dialogs/Makefile.am
+++ b/pluma/dialogs/Makefile.am
@@ -6,8 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/pluma \
-I$(top_builddir)/pluma \
$(PLUMA_CFLAGS) \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS)
+ $(WARN_CFLAGS)
noinst_LTLIBRARIES = libdialogs.la
diff --git a/tools/plugin_template/Makefile.am b/tools/plugin_template/Makefile.am
index 93c79ae7..cf14f903 100644
--- a/tools/plugin_template/Makefile.am
+++ b/tools/plugin_template/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
-DPLUMA_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
plugin_LTLIBRARIES = lib##(PLUGIN_MODULE).la