Merge pull request #127 from monsta/cleanup

some cleanup in build files

8 files changed, 1 insertions, 31 deletions

diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index c3ac7744..8bd165c7 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -8,7 +8,6 @@ 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/configure.ac b/configure.ac
index ef243627..04342f1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,14 +57,6 @@ AC_CHECK_FUNCS([getpgid])
 LIBGDICT_LT_VERSION=6:7:0
 AC_SUBST(LIBGDICT_LT_VERSION)
 
-dnl host architecture check
-AS_CASE([$host],
-
-        [*-*-solaris*], [SUN_OS="-DON_SUN_OS"],
-        [*],            [SUN_OS=""]
-)
-AC_SUBST(SUN_OS)
-
 dnl pkg-config check
 
 GLIB_REQUIRED=2.36.0
@@ -73,15 +65,6 @@ GIO_UNIX_REQUIRED=2.18.0
 LIBMATE_PANEL_APPLET_REQUIRED=1.7.0
 LIBGTOP_REQUIRED=2.12.0
 
-AC_ARG_ENABLE(deprecated,
-	[AC_HELP_STRING([--enable-deprecated],
-		[use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
-	[enable_deprecated=no])
-
-if test "x$enable_deprecated" = "xyes"; then
-	DISABLE_DEPRECATED=""
-fi
-
 dnl GTK library version
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
diff --git a/gsearchtool/libeggsmclient/Makefile.am b/gsearchtool/libeggsmclient/Makefile.am
index cc64b8cb..205c4329 100644
--- a/gsearchtool/libeggsmclient/Makefile.am
+++ b/gsearchtool/libeggsmclient/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = $(DISABLE_DEPRECATED)
-
 noinst_LTLIBRARIES = libeggsmclient.la
 
 libeggsmclient_la_LIBADD = $(LIBEGGSMCLIENT_LIBS)           \
diff --git a/gsearchtool/libmateui-deprecated/Makefile.am b/gsearchtool/libmateui-deprecated/Makefile.am
index c3ed815d..8bf41d4b 100644
--- a/gsearchtool/libmateui-deprecated/Makefile.am
+++ b/gsearchtool/libmateui-deprecated/Makefile.am
@@ -1,8 +1,3 @@
-AM_CPPFLAGS = \
-	-DGTK_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DG_DISABLE_DEPRECATED
-
 noinst_LTLIBRARIES = libmateui-deprecated.la
 
 libmateui_deprecated_la_CFLAGS = \
diff --git a/gsearchtool/src/Makefile.am b/gsearchtool/src/Makefile.am
index 58a042ec..dfe68e01 100644
--- a/gsearchtool/src/Makefile.am
+++ b/gsearchtool/src/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gsearchtool/libeggsmclient \
 	-I$(top_srcdir)/gsearchtool/libmateui-deprecated \
-	$(DISABLE_DEPRECATED) \
 	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DDATADIR=\""$(datadir)"\" \
diff --git a/logview/src/Makefile.am b/logview/src/Makefile.am
index 70cbee21..e5b61d7c 100644
--- a/logview/src/Makefile.am
+++ b/logview/src/Makefile.am
@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
 	-DDATADIR=\""$(datadir)"\"				\
 	-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 d4783f4c..c8cb3fa5 100644
--- a/mate-dictionary/libgdict/Makefile.am
+++ b/mate-dictionary/libgdict/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gdict\" 				\
 	-DMATELOCALEDIR=\""$(mateutilslocaledir)"\" 		\
 	-DGDICTSOURCESDIR=\""$(datadir)/mate-dict/sources"\" 	\
 	-DGDICT_ENABLE_INTERNALS				\
-	$(DISABLE_DEPRECATED)					\
 	$(NULL)
 
 sources_h =	\
diff --git a/mate-screenshot/src/Makefile.am b/mate-screenshot/src/Makefile.am
index e27c0903..e05f69e0 100644
--- a/mate-screenshot/src/Makefile.am
+++ b/mate-screenshot/src/Makefile.am
@@ -2,8 +2,7 @@ AM_CPPFLAGS =							\
 	-I.							\
 	-I$(srcdir)						\
 	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DUIDIR=\""$(datadir)/mate-screenshot"\"					\
-	$(DISABLE_DEPRECATED)
+	-DUIDIR=\""$(datadir)/mate-screenshot"\"
 
 bin_PROGRAMS = mate-screenshot