]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Bug 535862 – gtk_action_create_icon can't create icons from the icon
[~andy/gtk] / gtk / Makefile.am
index b46d379b8accbe61e8499fd34a07b691276125c0..8a8204ef6fba3d2f0c41789fb30dbe401799dbea 100644 (file)
@@ -6,7 +6,7 @@ xdgmimedir =
 if OS_UNIX
 xdgmimedir += xdgmime
 if USE_QUARTZ
-GTK_PRINT_PREVIEW_COMMAND="/Applications/Preview.app/Contents/MacOS/Preview %f"
+GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
 else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
@@ -44,7 +44,8 @@ INCLUDES =                                            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_DEP_CFLAGS)                               \
-       $(gtk_clipboard_dnd_c_sources_CFLAGS)
+       $(gtk_clipboard_dnd_c_sources_CFLAGS)           \
+       $(INCLUDED_IMMODULE_DEFINE)
 
 gtarget=$(gdktarget)
 
@@ -54,7 +55,7 @@ endif
 
 if OS_WIN32
 gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols gtk.def
+gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
 
 gtk_win32_res = gtk-win32-res.o
 gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
@@ -63,7 +64,7 @@ gtk-win32-res.o : gtk-win32.rc
        $(WINDRES) gtk-win32.rc $@
 
 install-def-file: gtk.def
-       $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+       $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
@@ -87,8 +88,10 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+# This places the generated .def file in srcdir, since it is expected to be there.
+# (The one from a tarball is)
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 gtkalias.h: gtk.symbols
          $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
@@ -106,26 +109,39 @@ if OS_LINUX
 TESTS += abicheck.sh pltcheck.sh
 endif
 
-# libtool stuff: set version and export symbols for resolving
-# since automake doesn't support conditionalized libsomething_la_LDFLAGS
-# we use the general approach here
 libgtkincludedir = $(includedir)/gtk-2.0/gtk
 libadd =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(GTK_DEP_LIBS)
+deps =
 
 if OS_UNIX
 libadd += xdgmime/libxdgmime.la
 endif
 
-# common options for the various packages.
+# libtool stuff: set version and export symbols for resolving
+# since automake doesn't support conditionalized libsomething_la_LDFLAGS
+# we use the general approach here
 libtool_opts =                                                 \
   -version-info $(LT_VERSION_INFO)                             \
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)    \
   -rpath $(libdir) $(libgtk_target_ldflags)
 
 
+included-modules:
+if HAVE_INCLUDED_IMMMODULES
+       @cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules
+
+libadd += $(INCLUDED_IMMODULE_OBJ)
+deps += $(INCLUDED_IMMODULE_OBJ)
+
+$(INCLUDED_IMMODULE_OBJ): included-modules
+       @true
+endif
+
+.PHONY: included-modules
+
 #
 # setup source file variables
 #
@@ -216,7 +232,6 @@ gtk_public_h_sources =          \
        gtkinputdialog.h        \
        gtkinvisible.h          \
        gtkitem.h               \
-       gtkitemfactory.h        \
        gtklabel.h              \
        gtklayout.h             \
        gtklinkbutton.h         \
@@ -230,20 +245,18 @@ gtk_public_h_sources =          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
        gtkmodules.h            \
+       gtkmountoperation.h     \
        gtknotebook.h           \
        gtkobject.h             \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
-       gtkpixmap.h             \
        gtkplug.h               \
-       gtkpreview.h            \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
        gtkprivate.h            \
-       gtkprogress.h           \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -267,6 +280,7 @@ gtk_public_h_sources =          \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
+       gtkshow.h               \
        gtksettings.h           \
        gtksizegroup.h          \
        gtksocket.h             \
@@ -287,7 +301,6 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtktipsquery.h          \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
@@ -296,7 +309,6 @@ gtk_public_h_sources =          \
        gtktoolitem.h           \
        gtktoolshell.h          \
        gtktooltip.h            \
-       gtktooltips.h           \
        gtktreednd.h            \
        gtktreemodel.h          \
        gtktreemodelfilter.h    \
@@ -325,7 +337,8 @@ gtk_unix_print_public_h_sources =    \
        gtkpagesetupunixdialog.h        \
        gtkprintunixdialog.h            \
        gtkprinter.h                    \
-       gtkprintjob.h
+       gtkprintjob.h                   \
+       gtkunixprint.h
 endif
 
 # Installed header files without compatibility guarantees
@@ -338,8 +351,6 @@ gtk_semi_private_h_sources =    \
 gtk_private_h_sources =                \
        gtkquery.h              \
        gtksearchengine.h       \
-       gtksearchenginebeagle.h \
-       gtksearchenginetracker.h\
        gtksearchenginesimple.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
@@ -385,8 +396,6 @@ gtk_private_h_sources =             \
 gtk_base_c_sources =            \
        gtkquery.c              \
        gtksearchengine.c       \
-       gtksearchenginebeagle.c \
-       gtksearchenginetracker.c\
        gtksearchenginesimple.c \
        fnmatch.c               \
        gtkaboutdialog.c        \
@@ -478,7 +487,6 @@ gtk_base_c_sources =            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
-       gtkitemfactory.c        \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
@@ -496,21 +504,19 @@ gtk_base_c_sources =            \
        gtkmisc.c               \
        gtkmnemonichash.c       \
        gtkmodules.c            \
+       gtkmountoperation.c     \
        gtknotebook.c           \
        gtkobject.c             \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
-       gtkpixmap.c             \
        gtkplug.c               \
-       gtkpreview.c            \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c      \
        gtkprintsettings.c      \
        gtkprintutils.c         \
-       gtkprogress.c           \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -539,6 +545,7 @@ gtk_base_c_sources =            \
        gtkseparatortoolitem.c  \
        gtksettings.c           \
        gtksizegroup.c          \
+       gtkshow.c               \
        gtksocket.c             \
        gtkspinbutton.c         \
        gtkstatusbar.c          \
@@ -564,7 +571,6 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
-       gtktipsquery.c          \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
@@ -573,7 +579,6 @@ gtk_base_c_sources =            \
        gtktoolitem.c           \
        gtktoolshell.c          \
        gtktooltip.c            \
-       gtktooltips.c           \
        gtktreedatalist.c       \
        gtktreednd.c            \
        gtktreemodel.c          \
@@ -602,36 +607,48 @@ gtk_base_c_sources =            \
        $(gtk_clipboard_dnd_c_sources)
 
 # Broken
-gtk_public_h_sources +=         \
-        gtktext.h               \
-        gtktree.h               \
-        gtktreeitem.h
-gtk_base_c_sources +=           \
-        gtktext.c               \
-        gtktree.c               \
-        gtktreeitem.c
+gtk_public_h_sources += \
+       gtktext.h               \
+       gtktree.h               \
+       gtktreeitem.h
+gtk_base_c_sources += \
+       gtktext.c               \
+       gtktree.c               \
+       gtktreeitem.c
 
 # Deprecated
-gtk_public_h_sources +=         \
-        gtkclist.h              \
-        gtkcombo.h              \
-        gtkctree.h              \
-        gtkfilesel.h            \
-        gtklist.h               \
-        gtklistitem.h           \
-        gtkoldeditable.h        \
-        gtkoptionmenu.h         \
-        gtksignal.h
-gtk_base_c_sources +=           \
-        gtkclist.c              \
-        gtkcombo.c              \
-        gtkctree.c              \
-        gtkfilesel.c            \
-        gtklist.c               \
-        gtklistitem.c           \
-        gtkoldeditable.c        \
-        gtkoptionmenu.c         \
-        gtksignal.c
+gtk_public_h_sources += \
+       gtkclist.h              \
+       gtkcombo.h              \
+       gtkctree.h              \
+       gtkfilesel.h            \
+       gtkitemfactory.h        \
+       gtklist.h               \
+       gtklistitem.h           \
+       gtkoldeditable.h        \
+       gtkoptionmenu.h         \
+       gtkpixmap.h             \
+       gtkpreview.h            \
+       gtkprogress.h           \
+       gtksignal.h             \
+       gtktipsquery.h          \
+       gtktooltips.h
+gtk_base_c_sources += \
+       gtkclist.c              \
+       gtkcombo.c              \
+       gtkctree.c              \
+       gtkfilesel.c            \
+       gtkitemfactory.c        \
+       gtklist.c               \
+       gtklistitem.c           \
+       gtkoldeditable.c        \
+       gtkoptionmenu.c         \
+       gtkpixmap.c             \
+       gtkpreview.c            \
+       gtkprogress.c           \
+       gtksignal.c             \
+       gtktipsquery.c          \
+       gtktooltips.c
 
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
@@ -646,7 +663,9 @@ gtk_os_unix_c_sources = \
        gtkprintjob.c                   \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
-        gtkprintbackend.c
+        gtkprintbackend.c              \
+       gtksearchenginebeagle.c         \
+       gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
@@ -656,7 +675,9 @@ gtk_private_h_sources += \
        gtkprinter-private.h            \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
-       gtkprinteroptionwidget.h
+       gtkprinteroptionwidget.h        \
+       gtksearchenginebeagle.h         \
+       gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
@@ -729,7 +750,8 @@ gtk_built_public_sources =                  \
 gtk_built_private_headers =                    \
        gtkalias.h                              \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkimcontextsimpleseqs.h
 
 gtk_built_sources =                            \
        gtkaliasdef.c                           \
@@ -847,28 +869,29 @@ gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
 libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
 
 libgtk_x11_2_0_la_LIBADD = $(libadd)
-libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
 libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
 
+libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
+libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
+
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
@@ -989,7 +1012,10 @@ STOCK_ICONS = \
        stock-icons/16/gtk-paste.png                    \
        stock-icons/16/gtk-preferences.png              \
        stock-icons/16/gtk-print.png                    \
+       stock-icons/16/gtk-print-error.png              \
        stock-icons/16/gtk-print-preview.png            \
+       stock-icons/16/gtk-print-report.png             \
+       stock-icons/16/gtk-print-warning.png            \
        stock-icons/16/gtk-properties.png               \
        stock-icons/16/gtk-quit.png                     \
        stock-icons/16/gtk-redo-ltr.png                 \