Merge pull request #88 from infirit/master

Add config options and bring ChangeLog generation up to date

5 files changed, 39 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index bc08da9..f331bf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,23 +40,16 @@ DISTCHECK_CONFIGURE_FLAGS = 				\
 	--disable-applets				\
 	--disable-tests
 
-distclean-local:
-	if test $(srdcir) = .; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status  --date=short --no-color) | fmt --split-only > [email protected] \
-	  && mv -f [email protected] $@ \
-	  || ($(RM) [email protected]; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		 echo '# Generated by Makefile. Do not edit.'; echo; \
+		 $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+			echo Failed to generate ChangeLog >&2 ); \
 	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
+		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
-
-.PHONY: ChangeLog
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 5e9e834..fd8b54c 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS =							\
 	-DEGG_LOGGING="\"GPM_LOGGING\""				\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""				\
 	-I$(top_srcdir)/libdbus-glib				\
+	$(DISABLE_DEPRECATED)
 	$(NULL)
 
 libexec_PROGRAMS=mate-brightness-applet
diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index fa12b4b..c3244c1 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS =							\
 	-DEGG_LOGGING="\"GPM_LOGGING\""				\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""				\
 	-I$(top_srcdir)/libdbus-glib				\
+	$(DISABLE_DEPRECATED)					\
 	$(NULL)
 
 libexec_PROGRAMS=mate-inhibit-applet
diff --git a/configure.ac b/configure.ac
index 0976d85..c5bd72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,31 @@ if test x$enable_strict != xno; then
 	fi
 fi
 
-if test "$GCC" = "yes"; then
+AC_ARG_ENABLE(deprecated,
+        [AS_HELP_STRING([--enable-deprecated],
+                [Warn about deprecated usages [default=no]])],,
+         [enable_deprecated=no])
+
+if test "x$enable_deprecated" = "xno"; then
+	DISABLE_DEPRECATED=" \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DGTK_DISABLE_SINGLE_INCLUDES \
+	-DG_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGDK_MULTIHEAD_SAFE \
+	-DGTK_MULTIHEAD_SAFE \
+	-DGSEAL_ENABLE"
+
+	CPPFLAGS="$CPPFLAGS $DISABLE_DEPRECATED"
+fi
+
+AC_ARG_ENABLE(extra-warn,
+        [AS_HELP_STRING([--enable-extra-warn],
+                [Enable extra warnings. gcc only. [default=no]])],,
+         [enable_extra_warn=no])
+
+if test "x$enable_extra_warn" = "xyes" && test "$GCC" = "yes"; then
 	WARNINGFLAGS="$WARNINGFLAGS -Wall"
 	WARNINGFLAGS="$WARNINGFLAGS -Wcast-align -Wno-uninitialized"
 	WARNINGFLAGS="$WARNINGFLAGS -Wmissing-declarations"
diff --git a/src/Makefile.am b/src/Makefile.am
index a10b98b..350e0cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,7 @@ AM_CPPFLAGS =						\
 	-DEGG_LOGGING="\"GPM_LOGGING\""			\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""			\
 	-I$(top_srcdir)					\
+	$(DISABLE_DEPRECATED)				\
 	$(NULL)
 
 bin_PROGRAMS =						\