# Makefile.am for gtk+/gtk
include $(top_srcdir)/Makefile.decl
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+ --add-include-path=../gdk-pixbuf \
+ --add-include-path=../gdk
+INTROSPECTION_COMPILER_ARGS = \
+ --includedir=$(srcdir) \
+ --includedir=. \
+ --includedir=../gdk-pixbuf \
+ --includedir=../gdk
if USE_QUARTZ
GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
$(WINDRES) gtk-win32.rc $@
install-def-file: gtk.def
- $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+ $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+ -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
else
install-def-file:
uninstall-def-file:
TESTS += abicheck.sh pltcheck.sh
endif
-libgtkincludedir = $(includedir)/gtk-2.0/gtk
+libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
gtkaccessible.h \
gtkaction.h \
gtkactiongroup.h \
+ gtkaccelgroupprivate.h \
gtkactivatable.h \
gtkadjustment.h \
gtkalignment.h \
gtkenums.h \
gtkeventbox.h \
gtkexpander.h \
+ gtkextendedlayout.h \
gtkfilechooser.h \
gtkfilechooserbutton.h \
gtkfilechooserdialog.h \
gtkmountoperation.h \
gtknotebook.h \
gtkobject.h \
+ gtkoffscreenwindow.h \
gtkorientable.h \
gtkpagesetup.h \
gtkpaned.h \
gtktoolbar.h \
gtktoolbutton.h \
gtktoolitem.h \
- gtktoolitemgroup.h \
- gtktoolpalette.h \
+ gtktoolitemgroup.h \
+ gtktoolpalette.h \
gtktoolshell.h \
gtktooltip.h \
gtktreednd.h \
gtktextutil.h \
gtkthemes.h \
gtktoggleactionprivate.h\
+ gtktoolpaletteprivate.h \
gtktreedatalist.h \
gtktreeprivate.h \
gtkwindow-decorate.h \
gtkentrycompletion.c \
gtkeventbox.c \
gtkexpander.c \
+ gtkextendedlayout.c \
gtkfilechooser.c \
gtkfilechooserbutton.c \
gtkfilechooserdefault.c \
gtkimmodule.c \
gtkimmulticontext.c \
gtkinfobar.c \
- gtkinputdialog.c \
gtkinvisible.c \
gtkitem.c \
gtkkeyhash.c \
gtklinkbutton.c \
gtkliststore.c \
gtkmain.c \
- gtkmarshal.c \
gtkmarshalers.c \
gtkmenu.c \
gtkmenubar.c \
gtkmountoperation.c \
gtknotebook.c \
gtkobject.c \
+ gtkoffscreenwindow.c \
gtkorientable.c \
gtkpagesetup.c \
gtkpaned.c \
gtkwindow.c \
$(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
-
# Deprecated
gtk_public_h_sources += \
- gtkclist.h \
- gtkcombo.h \
- gtkctree.h \
- gtkcurve.h \
- gtkfilesel.h \
- gtkgamma.h \
- gtkinputdialog.h \
- gtkitemfactory.h \
- gtklist.h \
- gtklistitem.h \
- gtkoldeditable.h \
- gtkoptionmenu.h \
- gtkpixmap.h \
- gtkpreview.h \
- gtkprogress.h \
- gtksignal.h \
- gtktipsquery.h \
- gtktooltips.h
+ gtkprogress.h
gtk_base_c_sources += \
- gtkclist.c \
- gtkcombo.c \
- gtkctree.c \
- gtkcurve.c \
- gtkfilesel.c \
- gtkgamma.c \
- gtkitemfactory.c \
- gtklist.c \
- gtklistitem.c \
- gtkoldeditable.c \
- gtkoptionmenu.c \
- gtkpixmap.c \
- gtkpreview.c \
- gtkprogress.c \
- gtksignal.c \
- gtktipsquery.c \
- gtktooltips.c
+ gtkprogress.c
gtk_c_sources = $(gtk_base_c_sources)
gtk_all_c_sources = $(gtk_base_c_sources)
# built sources that get installed with the header files
gtk_built_public_sources = \
- gtkmarshal.h \
gtktypebuiltins.h
# built headers that don't get installed
gtktypebuiltins.c \
gtktypefuncs.c \
gtkmarshalers.c \
- gtkmarshal.c \
${gtk_built_private_headers} \
${gtk_built_public_sources}
stamp_files = \
stamp-gtkmarshalers.h \
- stamp-gtkmarshal.h \
stamp-gtktypebuiltins.h \
stamp-icons
gtkstatusicon-quartz.c \
gtk.symbols \
gtkversion.h.in \
- gtkmarshalers.list \
- gtkmarshal.list
+ gtkmarshalers.list
#
# setup GTK+ sources and their dependencies
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
-gtkmarshal.h: stamp-gtkmarshal.h
- @true
-stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
- echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \
- && $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --header >> xgen-gmh \
- && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
- && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
- && rm -f xgen-gmh \
- && echo timestamp > $(@F)
-gtkmarshal.c: @REBUILD@ gtkmarshal.list
- (echo "#include \"gtkmarshal.h\""; \
- echo "#include \"gtkalias.h\""; \
- $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
- echo "#define __gtk_marshal_MARSHAL_C__"; \
- echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
- && cp xgen-gmc gtkmarshal.c \
- && rm -f xgen-gmc
-
gtktypebuiltins.h: stamp-gtktypebuiltins.h
@true
stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
# target platform:
lib_LTLIBRARIES = $(gtktargetlib)
-gtkincludedir = $(includedir)/gtk-2.0/gtk
+gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
-gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
+gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-libgtk_x11_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_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_x11_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_3_0_la_LDFLAGS = $(libtool_opts)
+libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
+libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_x11_2_0_la_LIBADD = $(libadd)
-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_quartz_2_0_la_LIBADD = $(libadd)
-libgtk_directfb_2_0_la_LIBADD = $(libadd)
+libgtk_x11_3_0_la_LIBADD = $(libadd)
+libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_quartz_3_0_la_LIBADD = $(libadd)
+libgtk_directfb_3_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)
+libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
+libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
+libgtk_directfb_3_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-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
-install-exec-hook:
+install-exec-hook:
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
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
uninstall-mac-key-theme:
- rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
else
install-mac-key-theme:
uninstall-mac-key-theme:
endif
+dist-hook: ../build/win32/vs9/gtk.vcproj
+
+../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
+ for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+ case $$F in \
+ *.c) echo ' <File RelativePath="..\..\..\gtk\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libgtk.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
+ rm libgtk.sourcefiles
+
# Install a RC file for the default GTK+ theme, and key themes
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
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
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
+ rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
LDADDS = \
$(gtktargetlib) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib)
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+
+if HAVE_INTROSPECTION
+introspection_files = \
+ $(gtkinclude_HEADERS) \
+ $(gtk_all_c_sources) \
+ gtktypebuiltins.h \
+ gtktypebuiltins.c
+
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
+Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_CFLAGS = \
+ $(INCLUDES) \
+ -UGDK_DISABLE_DEPRECATED \
+ -UGTK_DISABLE_DEPRECATED \
+ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+Gtk_3_0_gir_LIBS = $(gtktargetlib)
+Gtk_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Gtk-3.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
+endif
#
# Installed tools
#
bin_PROGRAMS = \
- gtk-query-immodules-2.0 \
- gtk-update-icon-cache
+ gtk-query-immodules-3.0 \
+ gtk-update-icon-cache-3.0
-bin_SCRIPTS = gtk-builder-convert
+bin_SCRIPTS = gtk-builder-convert-3.0
if OS_WIN32
(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 ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
echo ' name="gtk-update-icon-cache.exe"' ; \
echo ' type="win32"/>' ; \
echo ' <!-- Identify the application security requirements. -->' ; \
endif
-gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
+gtk_query_immodules_3_0_LDADD = $(LDADDS)
+
+gtk_query_immodules_3_0_SOURCES = queryimmodules.c
-gtk_query_immodules_2_0_SOURCES = queryimmodules.c
+gtk_update_icon_cache_3_0_LDADD = \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(GDK_PIXBUF_DEP_LIBS)
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-gtk_update_icon_cache_SOURCES = \
+gtk_update_icon_cache_3_0_SOURCES = \
updateiconcache.c
.PHONY: files test test-debug
else
gtk_update_icon_cache_program = \
GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
- ./gtk-update-icon-cache
+ ./gtk-update-icon-cache-3.0
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(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
projects / ~andy / gtk / blobdiff