stylecontext: Do invalidation on first resize container

[~andy/gtk] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 14444964fdad200e46aa12bb0b851fa1398d037d..285785fee89f444c324cb38efbb4399c4e4d024d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -47,47 +47,39 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/install-sh \
        $(srcdir)/ltmain.sh \
        $(srcdir)/missing \
-       $(srcdir)/mkinstalldirs \
        $(srcdir)/omf.make \
        $(srcdir)/xmldocs.make \
        $(srcdir)/gtk-doc.make \
        $(srcdir)/ChangeLog \
        `find "$(srcdir)" -type f -name Makefile.in -print`
 
-GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-       rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-       cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
+       rm -f $@ && \
+       cp gtk+-3.0.pc $@
 
-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-       rm -f gdk-$(GDKTARGET)-3.0.pc && \
-       cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
-
-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-       rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-       cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-       rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-       cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
+       rm -f $@ && \
+       cp gdk-3.0.pc $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
+pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}
 
 if OS_UNIX
 pkgconfig_DATA += gtk+-unix-print-3.0.pc
 endif
 
-DISTCLEANFILES =                               \
-       gtk+-unix-print-3.0.pc                  \
-       gtk+-$(GDKTARGET)-3.0.pc                \
-       gdk-$(GDKTARGET)-3.0.pc                 \
-       gail-3.0.pc                             \
-       gtk+-$(GDKTARGET)-3.0-uninstalled.pc    \
-       gdk-$(GDKTARGET)-3.0-uninstalled.pc     \
-       gail-3.0-uninstalled.pc                 \
+DISTCLEANFILES = \
+       gtk+-unix-print-3.0.pc          \
+       gtk+-3.0.pc                     \
+       gtk+-x11-3.0.pc                 \
+       gdk-3.0.pc                      \
+       gdk-x11-3.0.pc                  \
+       gail-3.0.pc                     \
        config.lt
 
 distclean-local:
@@ -96,8 +88,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 GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
          && mv -f $@.tmp $@ \
          || ($(RM) $@.tmp; \
@@ -109,20 +100,7 @@ ChangeLog:
          echo A git checkout and git-log is required to generate this file >> $@); \
        fi
 
-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
-DEFAULT_GDKTARGET=x11
-install-data-hook:
-       (cd $(DESTDIR)$(pkgconfigdir) && \
-        test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-        test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-        rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-        rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
-       (cd $(DESTDIR)$(pkgconfigdir) && \
-        rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-        rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
-
 uninstall-local:
-       rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
        rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
 dist-hook:
@@ -161,6 +139,7 @@ DISTCHECK_CONFIGURE_FLAGS =         \
                --enable-gtk-doc        \
                --enable-man            \
                --disable-rebuilds      \
+               --disable-maintainer-mode \
                --enable-introspection
 
 GITIGNOREFILES = \