[gtk+/gtk-3-4] [Bug 675501] gtkquartz.h is not in the gtk+-3.5.2.tar.xz archive

[Matthias Clasen <matthiasc src gnome org>]

commit 0036683db7744295fe2a2d7966870c372c372e2d
Author: John Ralls <jralls ceridwen us>
Date:   Mon May 7 14:58:10 2012 -0700

    [Bug 675501] gtkquartz.h is not in the gtk+-3.5.2.tar.xz archive
    
    Rearrange the gtk_private_h_sources so that they're all added to EXTRA_DIST instead of only the ones included in the current build.

 gtk/Makefile.am |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1f45028..1c4285d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -871,28 +871,41 @@ gtk_use_quartz_c_sources = 	\
 gtk_use_stub_c_sources = 	\
 	gtkmountoperation-stub.c
 gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
-if USE_X11
-gtk_private_h_sources += 	\
+gtk_use_x11_private_h_sources = 	\
 	gtkxembed.h		\
 	gtktrayicon.h		\
 	xembed.h
+if USE_X11
 gtk_c_sources += $(gtk_use_x11_c_sources)
-else
-if USE_WIN32
-gtk_private_h_sources += 	\
+gtk_private_h_sources += $(gtk_use_x11_private_h_sources)
+endif
+
+gtk_use_win32_private_h_sources = 	\
 	gtkwin32embed.h		\
 	gtkwin32embedwidget.h
+if USE_WIN32
 gtk_c_sources += $(gtk_use_win32_c_sources)
-else
-if USE_QUARTZ
-gtk_private_h_sources += 	\
+gtk_private_h_sources += $(gtk_use_win32_private_h_sources)
+endif
+
+gtk_use_quartz_private_h_sources = 	\
 	gtksearchenginequartz.h	\
 	gtkmenuquartz.h \
 	gtkquartz.h
+if USE_QUARTZ
 gtk_c_sources += $(gtk_use_quartz_c_sources)
 libgtk_3_la_CFLAGS = "-xobjective-c"
+gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
+endif
 
-else
+gtk_all_private_h_sources = \
+	$(gtk_use_x11_private_h_sources) \
+	 $(gtk_use_win32_private_h_sources) \
+	$(gtk_use_quartz_private_h_sources)
+
+if !USE_X11
+if !USE_WIN32
+if !USE_QUARTZ
 gtk_c_sources += $(gtk_use_stub_c_sources)
 endif
 endif
@@ -976,7 +989,7 @@ MAINTAINERCLEANFILES = \
 	stock-icons/icon-theme.cache
 
 EXTRA_HEADERS =
-EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 EXTRA_DIST += $(STOCK_ICONS)