[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8dca2e758601d81cd86767ccd5be39426c35ef3..930cee3d94f7807f8886477c870b4b6343c7ec44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,10 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+# Set the minimum required Windows version to Windows 2000 (0x0500).
+if PLATFORM_WIN32
+AM_CPPFLAGS = -D_WIN32_WINNT=0x0500
+endif
+
 SUBDIRS = \
        cut-n-paste \
        data \
@@ -8,8 +15,11 @@ SUBDIRS = \
        properties \
        shell \
        po \
-       help \
-       test
+       help
+
+if ENABLE_TESTS
+SUBDIRS += test
+endif
 
 if ENABLE_THUMBNAILER
 SUBDIRS += thumbnailer
@@ -50,9 +60,35 @@ DISTCLEANFILES =             \
        intltool-merge          \
        intltool-update
 
-ACLOCAL_AMFLAGS = -I m4
+MAINTAINERCLEANFILES = \
+       ChangeLog \
+       $(srcdir)/INSTALL \
+       $(srcdir)/aclocal.m4 \
+       $(srcdir)/autoscan.log \
+       $(srcdir)/compile \
+       $(srcdir)/config.guess \
+       $(srcdir)/config.h.in \
+       $(srcdir)/config.sub \
+       $(srcdir)/configure \
+       $(srcdir)/configure.scan \
+       $(srcdir)/depcomp \
+       $(srcdir)/install-sh \
+       $(srcdir)/ltmain.sh \
+       $(srcdir)/missing \
+       $(srcdir)/mkinstalldirs \
+       $(srcdir)/omf.make \
+       $(srcdir)/xmldocs.make \
+       $(srcdir)/gtk-doc.make \
+       $(srcdir)/po/Makefile.in.in \
+       `find "$(srcdir)" -type f -name Makefile.in -print`
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-shave --disable-nautilus
+DISTCHECK_CONFIGURE_FLAGS = \
+       --disable-schemas-install \
+       --disable-scrollkeeper \
+       --enable-gtk-doc \
+       --disable-nautilus \
+       --disable-tests \
+       --disable-silent-rules
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
@@ -63,8 +99,7 @@ distclean-local:
        fi
 
 ChangeLog:
-       @echo Creating $@
-       @if test -d "$(srcdir)/.git"; then \
+       $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
          (GIT_DIR=$(top_srcdir)/.git ./missing --run git log -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
          && mv -f $@.tmp $@ \
          || ($(RM) $@.tmp; \
@@ -77,3 +112,5 @@ ChangeLog:
        fi
 
 .PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk