Delete EWMH properties if no private->state flags are set. (#66754)

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 73681d0aa89ee9dcfb901eff2008dbb75a74e514..6258442a5988dbc4d564126a4a8d1a3b574e7e3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,21 +10,17 @@ EXTRA_DIST =                        \
        HACKING                 \
        gtk+.spec.in            \
        makecopyright           \
-       TODO                    \
-       TODO.xml                \
        NEWS.pre-1-0            \
        ChangeLog.pre-1-0       \
        ChangeLog.pre-1-2       \
+       ChangeLog.pre-2-0       \
        README.cvs-commits      \
        README.win32            \
-       README.nanox            \
        config.h.win32          \
        gtk-zip.sh              \
-       po/README.tools         \
+       sanitize-la.sh          \
        po/README.translators   \
-       po/desk.pl              \
        po/makefile.mingw       \
-       po/update.pl            \
        po/po2tbl.sed.in        \
        examples/aspectframe/Makefile  \
        examples/aspectframe/aspectframe.c  \
@@ -113,9 +109,6 @@ EXTRA_DIST =                        \
        examples/spinbutton/Makefile  \
        examples/find-examples.sh
 
-#      examples/packer/Makefile  \
-#      examples/packer/pack.c  \
-
 GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
@@ -148,8 +141,8 @@ DISTCLEANFILES =                            \
 DEFAULT_GDKTARGET=x11
 install-data-hook:
        (cd $(DESTDIR)$(pkgconfigdir) && \
-        test -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
-        test -e gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+        test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
         rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
         rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
        (cd $(DESTDIR)$(pkgconfigdir) && \
@@ -157,7 +150,7 @@ install-data-hook:
         rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
 dist-hook: gtk+.spec
-       if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \
+       if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
             CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
             CONFIG_HEADERS= \
             $(SHELL) config.status \
@@ -188,3 +181,28 @@ sanity:
 
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+       -rm -rf $(distdir)
+       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+       mkdir $(distdir)/=build
+       mkdir $(distdir)/=inst
+       dc_install_base=`cd $(distdir)/=inst && pwd`; \
+       cd $(distdir)/=build \
+         && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+         && $(MAKE) $(AM_MAKEFLAGS) \
+         && $(MAKE) $(AM_MAKEFLAGS) dvi \
+         && $(MAKE) $(AM_MAKEFLAGS) check \
+         && $(MAKE) $(AM_MAKEFLAGS) install \
+         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+         && $(MAKE) $(AM_MAKEFLAGS) dist
+       -rm -rf $(distdir)
+       @banner="$(distdir).tar.gz is ready for distribution"; \
+       dashes=`echo "$$banner" | sed s/./=/g`; \
+       echo "$$dashes"; \
+       echo "$$banner"; \
+       echo "$$dashes"