Merge branch 'win32-theme2'

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d6661af7943480502bcaa273c6c07ffb6af73eb9..231902f11913b7b22e401ecdaa4dbcfbee522c7f 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -465,6 +465,7 @@ gtk_private_h_sources =             \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
        gtkwidgetprivate.h      \
+       gtkwin32themeprivate.h  \
        gtkwindowprivate.h      \
        gtktreemenu.h           \
        $(gtk_clipboard_dnd_h_sources) \
@@ -724,6 +725,7 @@ gtk_base_c_sources =                \
        gtkwidget.c             \
        gtkwidgetpath.c         \
        gtkwindow.c             \
+       gtkwin32theme.c         \
        $(gtk_clipboard_dnd_c_sources) \
        $(gtk_appchooser_impl_c_sources)
 
@@ -829,7 +831,8 @@ gtk_built_public_sources =                  \
 # built headers that don't get installed
 gtk_built_private_headers =                    \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkwin32css.h
 
 gtk_built_sources =                            \
        gtktypebuiltins.c                       \
@@ -841,6 +844,7 @@ gtk_built_sources =                         \
 stamp_files =                                  \
        stamp-gtkmarshalers.h                   \
        stamp-gtktypebuiltins.h                 \
+       stamp-gtkwin32css.h                     \
        stamp-icons
 
 # non-header sources (headers should be specified in the above variables)
@@ -852,6 +856,7 @@ gtk_extra_sources =                         \
        gen-paper-names.c                       \
        gtkstatusicon-quartz.c                  \
        gtk.symbols                             \
+       gtk-win32.css                           \
        gtkversion.h.in                         \
        gtkmarshalers.list                      \
        fallback-c89.c
@@ -897,6 +902,14 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
 
+gtkwin32css.h: stamp-gtkwin32css.h
+       @true
+stamp-gtkwin32css.h: @REBUILD@ gtk-win32.css
+       $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print "   \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gmlh\
+       && (cmp -s xgen-gmlh gtkwin32css.h || cp xgen-gmlh gtkwin32css.h) \
+       && rm -f xgen-gmlh \
+       && echo timestamp > $(@F)
+
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
 stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template