X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2FMakefile.am;h=fe084074656fb6c94a363331ca5b8ea55d4f6f6b;hb=7dbb99c297673f6caf6903bbb79231e80bfd006a;hp=36ad0292cbd22ff5c7eb88cf4423044a8fca163a;hpb=f18b0d4b7a5fadb6a321d0e7e7989d0a9e18fbdc;p=~andy%2Fgtk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 36ad0292c..fe0840746 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,13 +1,15 @@ # Makefile.am for gtk+/gtk +include $(top_srcdir)/Makefile.decl -SUBDIRS=theme-bits +xdgmimedir = if OS_UNIX -SUBDIRS += xdgmime -GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview %f" +xdgmimedir += xdgmime +GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" endif -DIST_SUBDIRS=theme-bits xdgmime +SUBDIRS = theme-bits $(xdgmimedir) . tests +DIST_SUBDIRS=theme-bits xdgmime tests if HAVE_CUPS GTK_PRINT_BACKENDS=file,cups @@ -27,6 +29,7 @@ INCLUDES = \ -DGTK_COMPILATION \ -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ + -I$(top_builddir) \ -I$(top_builddir)/gtk \ -I$(top_srcdir) -I../gdk \ -I$(top_srcdir)/gdk \ @@ -47,16 +50,16 @@ endif if OS_WIN32 gtk_def = gtk.def -gtk_win32_symbols = -export-symbols $(gtk_def) +gtk_win32_symbols = -export-symbols gtk.def gtk_win32_res = gtk-win32-res.o -gtk_win32_res_ldflag = -Wl,$(gtk_win32_res) +gtk_win32_res_ldflag = -Wl,gtk-win32-res.o 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) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def else @@ -143,6 +146,8 @@ gtk_public_h_sources = \ gtkbin.h \ gtkbindings.h \ gtkbox.h \ + gtkbuilder.h \ + gtkbuildable.h \ gtkbutton.h \ gtkcalendar.h \ gtkcelleditable.h \ @@ -250,6 +255,7 @@ gtk_public_h_sources = \ gtkradiotoolbutton.h \ gtkrange.h \ gtkrc.h \ + gtkrecentaction.h \ gtkrecentchooser.h \ gtkrecentchooserdialog.h \ gtkrecentchoosermenu.h \ @@ -258,6 +264,7 @@ gtk_public_h_sources = \ gtkrecentmanager.h \ gtkruler.h \ gtkscale.h \ + gtkscalebutton.h \ gtkscrollbar.h \ gtkscrolledwindow.h \ gtkselection.h \ @@ -275,6 +282,7 @@ gtk_public_h_sources = \ gtkstyle.h \ gtktable.h \ gtktearoffmenuitem.h \ + gtktestutils.h \ gtktext.h \ gtktextbuffer.h \ gtktextbufferrichtext.h \ @@ -292,6 +300,8 @@ gtk_public_h_sources = \ gtktoolbar.h \ gtktoolbutton.h \ gtktoolitem.h \ + gtktoolshell.h \ + gtktooltip.h \ gtktooltips.h \ gtktree.h \ gtktreednd.h \ @@ -309,6 +319,7 @@ gtk_public_h_sources = \ gtkvbbox.h \ gtkvbox.h \ gtkviewport.h \ + gtkvolumebutton.h \ gtkvpaned.h \ gtkvruler.h \ gtkvscale.h \ @@ -317,12 +328,13 @@ gtk_public_h_sources = \ gtkwidget.h \ gtkwindow.h +if OS_UNIX gtk_unix_print_public_h_sources = \ gtkpagesetupunixdialog.h \ gtkprintunixdialog.h \ gtkprinter.h \ gtkprintjob.h - +endif # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h @@ -332,8 +344,14 @@ gtk_semi_private_h_sources = \ # GTK+ header files that don't get installed gtk_private_h_sources = \ + gtkquery.h \ + gtksearchengine.h \ + gtksearchenginebeagle.h \ + gtksearchenginetracker.h\ + gtksearchenginesimple.h \ gtkdndcursors.h \ gtkentryprivate.h \ + gtkbuilderprivate.h \ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ @@ -355,7 +373,6 @@ gtk_private_h_sources = \ gtkrecentchooserdefault.h \ gtkrecentchooserprivate.h \ gtkrecentchooserutils.h \ - gtksequence.h \ gtksocketprivate.h \ gtktextbtree.h \ gtktextbufferserialize.h\ @@ -374,6 +391,11 @@ gtk_private_h_sources = \ # GTK+ C sources to build the library from gtk_base_c_sources = \ + gtkquery.c \ + gtksearchengine.c \ + gtksearchenginebeagle.c \ + gtksearchenginetracker.c\ + gtksearchenginesimple.c \ fnmatch.c \ gtkaboutdialog.c \ gtkaccelgroup.c \ @@ -391,6 +413,9 @@ gtk_base_c_sources = \ gtkbin.c \ gtkbindings.c \ gtkbox.c \ + gtkbuildable.c \ + gtkbuilder.c \ + gtkbuilderparser.c \ gtkbutton.c \ gtkcalendar.c \ gtkcelleditable.c \ @@ -452,6 +477,7 @@ gtk_base_c_sources = \ gtkhseparator.c \ gtkhsv.c \ gtkiconcache.c \ + gtkiconcachevalidator.c \ gtkiconfactory.c \ gtkicontheme.c \ gtkiconview.c \ @@ -509,6 +535,7 @@ gtk_base_c_sources = \ gtkrange.c \ gtkrbtree.c \ gtkrc.c \ + gtkrecentaction.c \ gtkrecentchooserdefault.c \ gtkrecentchooserdialog.c \ gtkrecentchoosermenu.c \ @@ -519,13 +546,13 @@ gtk_base_c_sources = \ gtkrecentmanager.c \ gtkruler.c \ gtkscale.c \ + gtkscalebutton.c \ gtkscrollbar.c \ gtkscrolledwindow.c \ gtkselection.c \ gtkseparator.c \ gtkseparatormenuitem.c \ gtkseparatortoolitem.c \ - gtksequence.c \ gtksettings.c \ gtksignal.c \ gtksizegroup.c \ @@ -537,6 +564,7 @@ gtk_base_c_sources = \ gtkstyle.c \ gtktable.c \ gtktearoffmenuitem.c \ + gtktestutils.c \ gtktext.c \ gtktextbtree.c \ gtktextbuffer.c \ @@ -561,6 +589,8 @@ gtk_base_c_sources = \ gtktoolbar.c \ gtktoolbutton.c \ gtktoolitem.c \ + gtktoolshell.c \ + gtktooltip.c \ gtktooltips.c \ gtktree.c \ gtktreedatalist.c \ @@ -579,6 +609,7 @@ gtk_base_c_sources = \ gtkuimanager.c \ gtkvbbox.c \ gtkvbox.c \ + gtkvolumebutton.c \ gtkviewport.c \ gtkvpaned.c \ gtkvruler.c \ @@ -607,6 +638,7 @@ gtk_all_c_sources += $(gtk_os_unix_c_sources) if OS_UNIX gtk_private_h_sources += \ gtkfilesystemunix.h \ + gtkiconcachevalidator.h \ gtkprintbackend.h \ gtkprinter-private.h \ gtkprinteroption.h \ @@ -635,10 +667,14 @@ gtk_use_win32_c_sources = \ gtksocket-win32.c \ gtkwin32embed.c \ gtkwin32embedwidget.c +gtk_use_quartz_c_sources = \ + gtksearchenginequartz.c \ + gtkplug-stub.c \ + gtksocket-stub.c gtk_use_stub_c_sources = \ gtkplug-stub.c \ gtksocket-stub.c -gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stub_c_sources) +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 gtk_c_sources += $(gtk_use_x11_c_sources) @@ -647,9 +683,15 @@ if USE_WIN32 gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h gtk_c_sources += $(gtk_use_win32_c_sources) else +if USE_QUARTZ +gtk_private_h_sources += gtksearchenginequartz.h +gtk_c_sources += $(gtk_use_quartz_c_sources) +gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" +else gtk_c_sources += $(gtk_use_stub_c_sources) endif endif +endif if USE_QUARTZ gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h @@ -679,6 +721,7 @@ gtk_built_private_headers = \ gtk_built_sources = \ gtkaliasdef.c \ gtktypebuiltins.c \ + gtktypefuncs.c \ gtkmarshalers.c \ gtkmarshal.c \ ${gtk_built_private_headers} \ @@ -706,9 +749,9 @@ gtk_extra_sources = \ # # setup GTK+ sources and their dependencies # -MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) +MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) EXTRA_HEADERS = -EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) +EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources) EXTRA_DIST += $(gtk_built_sources) EXTRA_DIST += $(STOCK_ICONS) @@ -716,7 +759,7 @@ EXTRA_DIST += $(STOCK_ICONS) # rules to generate built sources # # setup autogeneration dependencies -gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc +gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf CLEANFILES = $(gen_sources) BUILT_SOURCES = $(gtk_built_sources) @@ -756,32 +799,31 @@ gtkmarshal.c: @REBUILD@ gtkmarshal.list echo "#define __gtk_marshal_MARSHAL_C__"; \ echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \ && cp xgen-gmc gtkmarshal.c \ - && rm -f xgen-gmc + && rm -f xgen-gmc gtktypebuiltins.h: stamp-gtktypebuiltins.h @true -stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile - ( cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \ +stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template + ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \ $(gtk_public_h_sources) ) >> xgen-gtbh \ && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ && rm -f xgen-gtbh \ && echo timestamp > $(@F) -gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile - ( cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \ - --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ +gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template + ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \ $(gtk_public_h_sources) ) > xgen-gtbc \ && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc +gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile + echo '#include ' > xgen-gtfsrc.c && \ + ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ + grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ + sort | uniq | \ + sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \ + && cp xgen-gtf $@ && rm -f xgen-gtf +gtktestutils.c: gtktypefuncs.c + # target platform: lib_LTLIBRARIES = $(gtktargetlib) @@ -799,13 +841,13 @@ 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) +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 -luuid +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) @@ -853,7 +895,10 @@ LDADDS = \ # # Installed tools # -bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache +bin_PROGRAMS = \ + gtk-query-immodules-2.0 \ + gtk-update-icon-cache +bin_SCRIPTS = gtk-builder-convert gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) gtk_query_immodules_2_0_LDADD = $(LDADDS) @@ -862,7 +907,8 @@ gtk_query_immodules_2_0_SOURCES = queryimmodules.c gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -gtk_update_icon_cache_SOURCES = updateiconcache.c +gtk_update_icon_cache_SOURCES = \ + updateiconcache.c .PHONY: files test test-debug @@ -872,9 +918,11 @@ files: done STOCK_ICONS = \ + stock-icons/16/document-open-recent.png \ stock-icons/16/gtk-about.png \ stock-icons/16/gtk-add.png \ stock-icons/16/gtk-cdrom.png \ + stock-icons/16/gtk-close.png \ stock-icons/16/gtk-connect.png \ stock-icons/16/gtk-convert.png \ stock-icons/16/gtk-copy.png \ @@ -924,6 +972,7 @@ STOCK_ICONS = \ stock-icons/16/gtk-network.png \ stock-icons/16/gtk-new.png \ stock-icons/16/gtk-open.png \ + stock-icons/16/gtk-page-setup.png \ stock-icons/16/gtk-paste.png \ stock-icons/16/gtk-preferences.png \ stock-icons/16/gtk-print.png \ @@ -938,6 +987,7 @@ STOCK_ICONS = \ stock-icons/16/gtk-revert-to-saved-rtl.png \ stock-icons/16/gtk-save-as.png \ stock-icons/16/gtk-select-all.png \ + stock-icons/16/gtk-select-color.png \ stock-icons/16/gtk-select-font.png \ stock-icons/16/gtk-sort-ascending.png \ stock-icons/16/gtk-sort-descending.png \ @@ -964,6 +1014,7 @@ STOCK_ICONS = \ stock-icons/20/gtk-no.png \ stock-icons/20/gtk-ok.png \ stock-icons/20/gtk-yes.png \ + stock-icons/24/document-open-recent.png \ stock-icons/24/gtk-about.png \ stock-icons/24/gtk-add.png \ stock-icons/24/gtk-bold.png \ @@ -1023,6 +1074,7 @@ STOCK_ICONS = \ stock-icons/24/gtk-orientation-landscape.png \ stock-icons/24/gtk-orientation-reverse-portrait.png \ stock-icons/24/gtk-orientation-portrait.png \ + stock-icons/24/gtk-page-setup.png \ stock-icons/24/gtk-paste.png \ stock-icons/24/gtk-preferences.png \ stock-icons/24/gtk-print.png \ @@ -1089,38 +1141,51 @@ GENERATED_ICONS = \ # 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 stock-icons/$$i \ - && $(RM) gtk-go-back-rtl.png \ - && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png \ - && $(RM) gtk-go-forward-rtl.png \ - && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png \ - && $(RM) gtk-goto-first-rtl.png \ - && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png \ - && $(RM) gtk-goto-last-rtl.png \ - && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png \ - && $(RM) gtk-media-forward-rtl.png \ - && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \ - && $(RM) gtk-media-next-rtl.png \ - && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \ - && $(RM) gtk-media-previous-rtl.png \ - && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \ - && $(RM) gtk-media-rewind-rtl.png \ - && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png \ - && $(RM) gtk-save.png \ - && $(LN_S) gtk-floppy.png gtk-save.png) \ - done \ + if [ ! -d stock-icons ]; then \ + for d in 16 20 24 32 48; do \ + mkdir -p stock-icons/$$d; \ + done; \ + for f in $(STOCK_ICONS); do \ + cp $(srcdir)/$$f $$(dirname $$f); \ + done; \ + chmod -R u+w stock-icons; \ + fi && \ + for i in 16 24; do \ + (cd stock-icons/$$i \ + && $(RM) gtk-go-back-rtl.png \ + && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png \ + && $(RM) gtk-go-forward-rtl.png \ + && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png \ + && $(RM) gtk-goto-first-rtl.png \ + && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png \ + && $(RM) gtk-goto-last-rtl.png \ + && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png \ + && $(RM) gtk-media-forward-rtl.png \ + && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png\ + && $(RM) gtk-media-next-rtl.png \ + && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \ + && $(RM) gtk-media-previous-rtl.png \ + && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \ + && $(RM) gtk-media-rewind-rtl.png \ + && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png\ + && $(RM) gtk-save.png \ + && $(LN_S) gtk-floppy.png gtk-save.png) \ + done \ && touch stamp-icons +if CROSS_COMPILING +gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +else +gtk_update_icon_cache_program = \ + GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ + ./gtk-update-icon-cache +endif + gtkbuiltincache.h: @REBUILD@ stamp-icons $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) - GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ - ./gtk-update-icon-cache --force --ignore-theme-index \ - --source builtin_icons stock-icons > gtkbuiltincache.h + $(gtk_update_icon_cache_program) --force --ignore-theme-index \ + --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ + mv gtkbuiltincache.h.tmp gtkbuiltincache.h EXTRA_DIST += \ $(STOCK_ICONS) \ @@ -1132,6 +1197,7 @@ EXTRA_DIST += \ tree_minus.xpm \ tree_plus.xpm \ gtk.def \ + gtk-builder-convert \ gtk-win32.rc \ gtk-win32.rc.in \ gtkwin32embed.h \ @@ -1141,13 +1207,18 @@ EXTRA_DIST += \ gtkfilesystemwin32.c \ gtkprint-win32.h \ gtkprint-win32.c \ + gtksearchenginequartz.h \ gtkrc.default \ gtkrc.key.default \ gtkrc.key.emacs \ makefile.msc \ makefile.msc.in \ makegtkalias.pl \ + aliasfilescheck.sh \ abicheck.sh \ - pltcheck.sh + pltcheck.sh \ + gtktypebuiltins.c.template \ + gtktypebuiltins.h.template + install-data-local: