2.9.0

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d3348ba3cf6f856addeb64dce27b1c13cd7544cf..dba3259272969f2a5f832a8e9161d220534c5c97 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -310,8 +310,10 @@ gtk_public_h_sources =          \
 
 gtk_unix_print_public_h_sources =    \
        gtkpagesetupunixdialog.h        \
+       gtkprintunixdialog.h            \
        gtkprinter.h                    \
-       gtkprintunixdialog.h
+       gtkprintjob.h
+
 
 # Installed header files without compatibility guarantees
 # that are not include in gtk/gtk.h
@@ -327,6 +329,7 @@ gtk_private_h_sources =             \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
        gtkfilechooserprivate.h \
+       gtkfilechoosersettings.h \
        gtkfilechooserutils.h   \
        gtkfilesystemmodel.h    \
        gtkfilesystemunix.h     \
@@ -412,6 +415,7 @@ gtk_c_sources =                 \
        gtkfilechooserdialog.c  \
        gtkfilechooserembed.c   \
        gtkfilechooserentry.c   \
+       gtkfilechoosersettings.c \
        gtkfilechooserutils.c   \
        gtkfilechooserwidget.c  \
        gtkfilefilter.c         \
@@ -586,8 +590,7 @@ gtk_private_h_sources += \
        gtkprinter-private.h            \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
-       gtkprinteroptionwidget.h        \
-       gtkprintjob.h
+       gtkprinteroptionwidget.h
 
 gtk_c_sources += \
        gtkfilesystemunix.c             \
@@ -664,14 +667,15 @@ gtk_built_sources =                               \
 stamp_files =                                  \
        stamp-gtkmarshalers.h                   \
        stamp-gtkmarshal.h                      \
-       stamp-gtktypebuiltins.h
+       stamp-gtktypebuiltins.h                 \
+       stamp-icons
 
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
 gtk_extra_sources =                            \
        paper_names.c                           \
-       paper_names_offsts.c                    \
+       paper_names_offsets.c                   \
        gen-paper-names.c                       \
        gtk.symbols                             \
        gtkversion.h.in                         \
@@ -1054,35 +1058,31 @@ GENERATED_ICONS = \
        stock-icons/24/gtk-media-rewind-rtl.png         \
        stock-icons/24/gtk-save.png
 
+# need to copy the icons so that we can replace the generated ones with
+# symlinks, even in the readonly srcdir case
 stamp-icons: $(STOCK_ICONS)
+       if [ ! -d stock-icons ]; then                                           \
+          cp -R $(srcdir)/stock-icons .;                                       \
+         chmod -R u+w stock-icons;                                             \
+        fi &&                                                                  \
        for i in 16 24; do                                                      \
-          (cd $(srcdir)/stock-icons/$$i                                        \
-          && rm -f gtk-go-back-rtl.png                                         \
-          && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png                \
-          && rm -f gtk-go-forward-rtl.png                                      \
-          && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png                \
-          && rm -f gtk-goto-first-rtl.png                                      \
-          && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png              \
-          && rm -f gtk-goto-last-rtl.png                                       \
-          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
-          && rm -f gtk-media-forward-rtl.png                                   \
-          && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png        \
-          && rm -f gtk-media-next-rtl.png                                      \
-          && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png         \
-          && rm -f gtk-media-previous-rtl.png                                  \
-          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
-          && rm -f gtk-media-rewind-rtl.png                                    \
-          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
-          && rm -f gtk-save.png                                                \
-          && $(LN_S) gtk-floppy.png gtk-save.png)                              \
+          (cd stock-icons/$$i                                                  \
+          && $(LN_S) -f gtk-go-forward-ltr.png gtk-go-back-rtl.png             \
+          && $(LN_S) -f gtk-go-back-ltr.png gtk-go-forward-rtl.png             \
+          && $(LN_S) -f gtk-goto-last-ltr.png gtk-goto-first-rtl.png           \
+          && $(LN_S) -f gtk-goto-first-ltr.png gtk-goto-last-rtl.png           \
+          && $(LN_S) -f gtk-media-rewind-ltr.png gtk-media-forward-rtl.png     \
+          && $(LN_S) -f gtk-media-previous-ltr.png gtk-media-next-rtl.png      \
+          && $(LN_S) -f gtk-media-next-ltr.png gtk-media-previous-rtl.png      \
+          && $(LN_S) -f gtk-media-forward-ltr.png gtk-media-rewind-rtl.png     \
+          && $(LN_S) -f gtk-floppy.png gtk-save.png)                           \
        done                                                                    \
        && touch stamp-icons
 
-gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) stamp-icons
+gtkbuiltincache.h: @REBUILD@ stamp-icons
+       $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache
        ./gtk-update-icon-cache --force --ignore-theme-index    \
-          --source builtin_icons $(srcdir)/stock-icons > gtkbuiltincache.h
-
-MAINTAINERCLEANFILES += stamp-icons
+          --source builtin_icons stock-icons > gtkbuiltincache.h
 
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \