]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
projects / ~andy / gtk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Change Latin Number to Gurmukhi for Step up the use of Punjabi (Gurmukhi)
[~andy/gtk] / gtk / Makefile.am
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d80dc7f56ae2c4071bb417557e246a6d8b49f74d..f10bb19eb666ff3fc0e13f0442d51a9f1cd841bd 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -178,6 +178,7 @@ gtk_public_h_sources =          \
        gtkcellrendererpixbuf.h \
        gtkcellrendererprogress.h \
        gtkcellrendererspin.h   \
+       gtkcellrendererspinner.h\
        gtkcellrenderertext.h   \
        gtkcellrenderertoggle.h \
        gtkcellview.h           \
@@ -190,13 +191,13 @@ gtk_public_h_sources =          \
        gtkcombobox.h           \
        gtkcomboboxentry.h      \
        gtkcontainer.h          \
-       gtkcurve.h              \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
        gtkdrawingarea.h        \
        gtkeditable.h           \
        gtkentry.h              \
+       gtkentrybuffer.h        \
        gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
@@ -210,7 +211,6 @@ gtk_public_h_sources =          \
        gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
-       gtkgamma.h              \
        gtkgc.h                 \
        gtkhandlebox.h          \
        gtkhbbox.h              \
@@ -230,7 +230,7 @@ gtk_public_h_sources =          \
        gtkimcontextsimple.h    \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
-       gtkinputdialog.h        \
+       gtkinfobar.h            \
        gtkinvisible.h          \
        gtkitem.h               \
        gtklabel.h              \
@@ -287,6 +287,7 @@ gtk_public_h_sources =          \
        gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
+       gtkspinner.h            \
        gtkstatusbar.h          \
        gtkstatusicon.h         \
        gtkstock.h              \
@@ -356,6 +357,7 @@ gtk_private_h_sources =             \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
        gtkbuilderprivate.h     \
+       gtkcustompaperunixdialog.h\
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
@@ -368,6 +370,7 @@ gtk_private_h_sources =             \
        gtkintl.h               \
        gtkkeyhash.h            \
        gtkmnemonichash.h       \
+       gtkmountoperationprivate.h \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
@@ -429,6 +432,7 @@ gtk_base_c_sources =            \
        gtkcellrendererpixbuf.c \
        gtkcellrendererprogress.c \
        gtkcellrendererspin.c   \
+       gtkcellrendererspinner.c\
        gtkcellrenderertext.c   \
        gtkcellrenderertoggle.c \
        gtkcellview.c           \
@@ -440,11 +444,11 @@ gtk_base_c_sources =            \
        gtkcombobox.c           \
        gtkcomboboxentry.c      \
        gtkcontainer.c          \
-       gtkcurve.c              \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
        gtkentry.c              \
+       gtkentrybuffer.c        \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
@@ -464,7 +468,6 @@ gtk_base_c_sources =            \
        gtkfontbutton.c         \
        gtkfontsel.c            \
        gtkframe.c              \
-       gtkgamma.c              \
        gtkgc.c                 \
        gtkhandlebox.c          \
        gtkhbbox.c              \
@@ -486,6 +489,7 @@ gtk_base_c_sources =            \
        gtkimcontextsimple.c    \
        gtkimmodule.c           \
        gtkimmulticontext.c     \
+       gtkinfobar.c            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
@@ -551,6 +555,7 @@ gtk_base_c_sources =            \
        gtkshow.c               \
        gtksocket.c             \
        gtkspinbutton.c         \
+       gtkspinner.c            \
        gtkstatusbar.c          \
        gtkstatusicon.c         \
        gtkstock.c              \
@@ -624,7 +629,10 @@ gtk_public_h_sources += \
        gtkclist.h              \
        gtkcombo.h              \
        gtkctree.h              \
+       gtkcurve.h              \
        gtkfilesel.h            \
+       gtkgamma.h              \
+       gtkinputdialog.h        \
        gtkitemfactory.h        \
        gtklist.h               \
        gtklistitem.h           \
@@ -640,7 +648,9 @@ gtk_base_c_sources += \
        gtkclist.c              \
        gtkcombo.c              \
        gtkctree.c              \
+       gtkcurve.c              \
        gtkfilesel.c            \
+       gtkgamma.c              \
        gtkitemfactory.c        \
        gtklist.c               \
        gtklistitem.c           \
@@ -657,6 +667,7 @@ gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
 gtk_os_unix_c_sources = \
+       gtkcustompaperunixdialog.c      \
        gtkpagesetupunixdialog.c        \
        gtkprinter.c                    \
        gtkprinteroption.c              \
@@ -695,19 +706,23 @@ gtk_use_x11_c_sources = \
        gtkplug-x11.c   \
        gtksocket-x11.c \
        gtkxembed.c     \
-       gtktrayicon-x11.c
+       gtktrayicon-x11.c \
+       gtkmountoperation-x11.c
 gtk_use_win32_c_sources = \
        gtkplug-win32.c   \
        gtksocket-win32.c \
        gtkwin32embed.c   \
-       gtkwin32embedwidget.c
+       gtkwin32embedwidget.c \
+       gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
        gtkplug-stub.c          \
-       gtksocket-stub.c
+       gtksocket-stub.c        \
+       gtkmountoperation-stub.c
 gtk_use_stub_c_sources = \
        gtkplug-stub.c   \
-       gtksocket-stub.c
+       gtksocket-stub.c \
+       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 += gtkxembed.h gtktrayicon.h xembed.h
@@ -900,8 +915,19 @@ if DISABLE_EXPLICIT_DEPS
        $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
 endif
 
+if USE_QUARTZ
+install-mac-key-theme:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+uninstall-mac-key-theme:
+       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+else
+install-mac-key-theme:
+uninstall-mac-key-theme:
+endif
+
 # Install a RC file for the default GTK+ theme, and key themes
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib install-def-file install-mac-key-theme
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
        $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
@@ -909,7 +935,7 @@ install-data-local: install-ms-lib install-def-file
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
        $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
-uninstall-local: uninstall-ms-lib uninstall-def-file
+uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
        rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
        rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
@@ -936,8 +962,42 @@ LDADDS =                                                           \
 bin_PROGRAMS = \
        gtk-query-immodules-2.0 \
        gtk-update-icon-cache
+
 bin_SCRIPTS = gtk-builder-convert
 
+if OS_WIN32
+
+# Workaround for UAC silliness: programs with "update" in their name
+# are believed to be installers and require elevated privileges to be
+# used... Use a manifest file to tell Windows that
+# gtk-update-icon-cache.exe doesn't require any special privileges.
+
+GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+
+bin_SCRIPTS += \
+       $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+
+gtk-update-icon-cache.exe.manifest:
+       (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
+        echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
+        echo '  <assemblyIdentity version="1.0.0.0"' ; \
+        echo '     processorArchitecture="'$(LIB_EXE_MACHINE_FLAG)'"' ; \
+        echo '     name="gtk-update-icon-cache.exe"' ; \
+        echo '     type="win32"/>' ; \
+        echo '  <!-- Identify the application security requirements. -->' ; \
+        echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
+        echo '    <security>' ; \
+        echo '      <requestedPrivileges>' ; \
+        echo '        <requestedExecutionLevel' ; \
+        echo '          level="asInvoker"' ; \
+        echo '          uiAccess="false"/>' ; \
+        echo '        </requestedPrivileges>' ; \
+        echo '       </security>' ; \
+        echo '  </trustInfo>' ; \
+        echo '</assembly>' ) >$@
+
+endif
+
 gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
@@ -1256,7 +1316,7 @@ gtk_update_icon_cache_program =                                                   \
 endif
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
-       $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+       $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
        $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
           --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
        mv gtkbuiltincache.h.tmp gtkbuiltincache.h
@@ -1283,6 +1343,7 @@ EXTRA_DIST +=                   \
        gtkrc.default           \
        gtkrc.key.default       \
        gtkrc.key.emacs         \
+       gtkrc.key.mac           \
        makefile.msc            \
        makefile.msc.in         \
        makegtkalias.pl         \
Andy's GTK+ repository