]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Updated Norwegian bokmål translation
[~andy/gtk] / gtk / Makefile.am
index 3bec78fc754df4e4f70ac767f1e290fc6d25fdd8..ebe87fe6259d7f810b027f1d62758ea3e119d8a4 100644 (file)
@@ -3,12 +3,10 @@ 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
@@ -50,7 +48,6 @@ INCLUDES =                                            \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
-       -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
@@ -77,9 +74,9 @@ gtk-win32-res.o : gtk-win32.rc
        $(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:
@@ -104,27 +101,15 @@ 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') > $(srcdir)/gtk.def
-
-gtkalias.h: gtk.symbols
-         $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
-gtkaliasdef.c: gtk.symbols
-         $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
-
-check-aliases:
-       @$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
-
-.PHONY: check-aliases
+       (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
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
-TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS += abicheck.sh pltcheck.sh
+TESTS = abicheck.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)                             \
        $(GTK_DEP_LIBS)
 deps =
@@ -133,6 +118,7 @@ deps =
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
 libtool_opts =                                                 \
+  $(GTK_LINK_FLAGS)                                            \
   -version-info $(LT_VERSION_INFO)                             \
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)    \
   -rpath $(libdir) $(libgtk_target_ldflags)
@@ -166,9 +152,11 @@ gtk_public_h_sources =          \
        gtkaccessible.h         \
        gtkaction.h             \
        gtkactiongroup.h        \
+       gtkaccelgroupprivate.h  \
        gtkactivatable.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
+       gtkapplication.h    \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkassistant.h          \
@@ -212,8 +200,6 @@ gtk_public_h_sources =          \
        gtkenums.h              \
        gtkeventbox.h           \
        gtkexpander.h           \
-       gtkextendedcell.h       \
-       gtkextendedlayout.h     \
        gtkfilechooser.h        \
        gtkfilechooserbutton.h  \
        gtkfilechooserdialog.h  \
@@ -298,6 +284,7 @@ gtk_public_h_sources =          \
        gtkshow.h               \
        gtksettings.h           \
        gtksizegroup.h          \
+       gtksizerequest.h        \
        gtksocket.h             \
        gtkspinbutton.h         \
        gtkspinner.h            \
@@ -405,7 +392,6 @@ gtk_private_h_sources =             \
        gtktexttypes.h          \
        gtktextutil.h           \
        gtkthemes.h             \
-       gtktoggleactionprivate.h\
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
@@ -428,6 +414,7 @@ gtk_base_c_sources =            \
        gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
+       gtkapplication.c \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkassistant.c          \
@@ -468,8 +455,6 @@ gtk_base_c_sources =            \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
-       gtkextendedcell.c       \
-       gtkextendedlayout.c     \
        gtkfilechooser.c        \
        gtkfilechooserbutton.c  \
        gtkfilechooserdefault.c \
@@ -508,7 +493,6 @@ gtk_base_c_sources =            \
        gtkimmodule.c           \
        gtkimmulticontext.c     \
        gtkinfobar.c            \
-       gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
        gtkkeyhash.c            \
@@ -517,7 +501,6 @@ gtk_base_c_sources =            \
        gtklinkbutton.c         \
        gtkliststore.c          \
        gtkmain.c               \
-       gtkmarshal.c            \
        gtkmarshalers.c         \
        gtkmenu.c               \
        gtkmenubar.c            \
@@ -571,6 +554,7 @@ gtk_base_c_sources =            \
        gtkseparatortoolitem.c  \
        gtksettings.c           \
        gtksizegroup.c          \
+       gtksizerequest.c        \
        gtkshow.c               \
        gtksocket.c             \
        gtkspinbutton.c         \
@@ -635,55 +619,6 @@ gtk_base_c_sources =            \
        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
-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
-
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
@@ -781,28 +716,23 @@ EXTRA_DIST += gtkquartz.h
 
 # built sources that get installed with the header files
 gtk_built_public_sources =                     \
-       gtkmarshal.h                            \
        gtktypebuiltins.h
 
 # built headers that don't get installed
 gtk_built_private_headers =                    \
-       gtkalias.h                              \
        gtkmarshalers.h                         \
        gtkbuiltincache.h                       \
        gtkimcontextsimpleseqs.h
 
 gtk_built_sources =                            \
-       gtkaliasdef.c                           \
        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
 
@@ -816,8 +746,7 @@ gtk_extra_sources =                         \
        gtkstatusicon-quartz.c                  \
        gtk.symbols                             \
        gtkversion.h.in                         \
-       gtkmarshalers.list                      \
-       gtkmarshal.list
+       gtkmarshalers.list
 
 #
 # setup GTK+ sources and their dependencies
@@ -851,29 +780,10 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
        && echo timestamp > $(@F)       
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
        (echo "#include \"gtkmarshalers.h\""; \
-        echo "#include \"gtkalias.h\""; \
         $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
        && 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
@@ -891,75 +801,87 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
        echo '#include <gtk/gtk.h>' > 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' | \
+         $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+         $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
 # 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.
@@ -968,13 +890,12 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
+DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
 
-TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) immodules.cache
 
 LDADDS =                                                               \
        $(gtktargetlib)                                                 \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(GTK_DEP_LIBS)
 
@@ -985,35 +906,38 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
-Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
-Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
-Gtk_2_0_gir_CFLAGS = \
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk --add-include-path=$(top_builddir)/gdk
+if USE_X11
+Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+endif
+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_2_0_gir_LIBS = $(gtktargetlib)
-Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
-INTROSPECTION_GIRS += Gtk-2.0.gir
+Gtk_3_0_gir_LIBS = $(gtktargetlib)
+Gtk_3_0_gir_FILES = $(introspection_files)
+INTROSPECTION_GIRS += Gtk-3.0.gir
 
 girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
+CLEANFILES += $(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
 
@@ -1048,18 +972,12 @@ gtk-update-icon-cache.exe.manifest:
 
 endif
 
-gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
-
-gtk_query_immodules_2_0_SOURCES = queryimmodules.c
-
-gtk_update_icon_cache_LDADD = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-       $(GDK_PIXBUF_DEP_LIBS)
-
+gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
+gtk_query_immodules_3_0_LDADD = $(LDADDS)
+gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_SOURCES = \
-       updateiconcache.c 
+gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS)
+gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c
 
 .PHONY: files test test-debug
 
@@ -1364,12 +1282,11 @@ 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
+          ./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
@@ -1384,7 +1301,7 @@ EXTRA_DIST +=                   \
        tree_minus.xpm          \
        tree_plus.xpm           \
        gtk.def                 \
-       gtk-builder-convert     \
+       gtk-builder-convert-3.0 \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
        gtkwin32embed.h         \
@@ -1399,10 +1316,7 @@ EXTRA_DIST +=                   \
        gtkrc.key.mac           \
        makefile.msc            \
        makefile.msc.in         \
-       makegtkalias.pl         \
-       aliasfilescheck.sh      \
        abicheck.sh             \
-       pltcheck.sh             \
        gtktypebuiltins.c.template      \
        gtktypebuiltins.h.template