summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-02-10 13:53:05 +0300
committermonsta <[email protected]>2017-02-28 17:38:43 +0300
commitd55a183c200bdcf1c4dbddd5438eae6fe9db2133 (patch)
tree4af36d387e668d1b0e9684d3b109156d270a14d2
parent30a41c8e0c639f6c4be8b3b8fa52a00b8b84236d (diff)
downloadpluma-d55a183c200bdcf1c4dbddd5438eae6fe9db2133.tar.bz2
pluma-d55a183c200bdcf1c4dbddd5438eae6fe9db2133.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 ba1656a1..38b1bf03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,21 +328,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 6b3a1cdd..2d844d0c 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 ec9fc410..9ca9e4b9 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 3b494cdf..ee2cca49 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 e375c898..787c5fa7 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 749be6bc..5ea0dd95 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 001b25ae..e352f8fb 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 2b85c58a..94075739 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 d1f8fe3b..5aa5f959 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 c8446959..9df55f40 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 01914351..0baa5723 100644
--- a/pluma/Makefile.am
+++ b/pluma/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/smclient \
$(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"
diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am
index bdeb4cec..11c5eccd 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