From c752f986e9e5974fe5b1b85ad79fff71eef3f160 Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 1 May 2014 17:11:17 +0200 Subject: Use DISABLE_DEPRECATED variable for deprecation --- baobab/src/Makefile.am | 1 + gsearchtool/Makefile.am | 2 +- libeggsmclient/Makefile.am | 4 +--- logview/Makefile.am | 1 + mate-dictionary/libgdict/Makefile.am | 6 +----- mate-screenshot/Makefile.am | 1 + 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am index 8bd165c7..c3ac7744 100644 --- a/baobab/src/Makefile.am +++ b/baobab/src/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -DPKGDATADIR=\""$(datadir)/mate-disk-usage-analyzer"\" \ -DBAOBAB_PIX_DIR=\""$(datadir)/mate-disk-usage-analyzer/pixmaps/"\" \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + $(DISABLE_DEPRECATED) \ $(NULL) bin_PROGRAMS = mate-disk-usage-analyzer diff --git a/gsearchtool/Makefile.am b/gsearchtool/Makefile.am index ea8f67c0..acdf8748 100644 --- a/gsearchtool/Makefile.am +++ b/gsearchtool/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = data help libmateui-deprecated AM_CPPFLAGS = \ -I$(srcdir)/libmateui-deprecated \ -I$(top_srcdir)/libeggsmclient \ - -DG_DISABLE_DEPRECATED \ + $(DISABLE_DEPRECATED) \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/libeggsmclient/Makefile.am b/libeggsmclient/Makefile.am index 4fb6ef52..cc64b8cb 100644 --- a/libeggsmclient/Makefile.am +++ b/libeggsmclient/Makefile.am @@ -1,6 +1,4 @@ -AM_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED +AM_CPPFLAGS = $(DISABLE_DEPRECATED) noinst_LTLIBRARIES = libeggsmclient.la diff --git a/logview/Makefile.am b/logview/Makefile.am index 1fc2bd49..271947d3 100644 --- a/logview/Makefile.am +++ b/logview/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -DLOGVIEWINSTALLPREFIX=\""$(prefix)/\"" \ -DLOGVIEW_DATADIR=\""$(pkgdatadir)"\" \ $(SUN_OS) \ + $(DISABLE_DEPRECATED) \ $(NULL) bin_PROGRAMS = mate-system-log diff --git a/mate-dictionary/libgdict/Makefile.am b/mate-dictionary/libgdict/Makefile.am index c159bd24..d4783f4c 100644 --- a/mate-dictionary/libgdict/Makefile.am +++ b/mate-dictionary/libgdict/Makefile.am @@ -8,11 +8,7 @@ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gdict\" \ -DMATELOCALEDIR=\""$(mateutilslocaledir)"\" \ -DGDICTSOURCESDIR=\""$(datadir)/mate-dict/sources"\" \ -DGDICT_ENABLE_INTERNALS \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DPANGO_DISABLE_DEPRECATED \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DGTK_DISABLE_SINGLE_INCLUDES \ + $(DISABLE_DEPRECATED) \ $(NULL) sources_h = \ diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am index 3a3f5df5..e8e54cad 100644 --- a/mate-screenshot/Makefile.am +++ b/mate-screenshot/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DUIDIR=\""$(uidir)"\" \ + $(DISABLE_DEPRECATED) \ $(NULL) bin_PROGRAMS = \ -- cgit v1.2.1