Skip to content

Commit

Permalink
build: remove option that disables deprecated stuff
Browse files Browse the repository at this point in the history
we don't need a build breakage on the first deprecated item, thanks
  • Loading branch information
monsta committed Feb 10, 2017
1 parent 30cb4f4 commit bef73d5
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 37 deletions.
15 changes: 0 additions & 15 deletions configure.ac
Expand Up @@ -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],
Expand Down
3 changes: 1 addition & 2 deletions plugins/changecase/Makefile.am
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions plugins/docinfo/Makefile.am
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions plugins/filebrowser/Makefile.am
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions plugins/modelines/Makefile.am
Expand Up @@ -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 = \
Expand Down
3 changes: 1 addition & 2 deletions plugins/sort/Makefile.am
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions plugins/spell/Makefile.am
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions plugins/taglist/Makefile.am
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions plugins/time/Makefile.am
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions plugins/trailsave/Makefile.am
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion pluma/Makefile.am
Expand Up @@ -12,7 +12,6 @@ AM_CPPFLAGS = \
$(PLUMA_CFLAGS) \
$(WARN_CFLAGS) \
$(INTROSPECTION_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\"

Expand Down
3 changes: 1 addition & 2 deletions pluma/dialogs/Makefile.am
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tools/plugin_template/Makefile.am
Expand Up @@ -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
Expand Down

0 comments on commit bef73d5

Please sign in to comment.