]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Updates.
[~andy/gtk] / gtk / Makefile.am
index 23cea4d19972bd8dd029c9a1ef224fe772a9ddb4..f80b6e58e18366527ff3ee44b6a7644c89908d2c 100644 (file)
@@ -1,29 +1,65 @@
-## Makefile.am for gtk+/gtk
+# Makefile.am for gtk+/gtk
 
 SUBDIRS=stock-icons
 
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
-       -DGTK_DISABLE_COMPAT_H                          \
-       -DGTK_EXE_PREFIX=\"$(exec_prefix)\"             \
+       -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
        -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        -DGTK_VERSION=\"@GTK_VERSION@\"                 \
+       -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"   \
        -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"  \
+       -DGTK_COMPILATION                               \
+       -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@                               \
-       @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
-       @PANGO_CFLAGS@                                  \
-       @GLIB_CFLAGS@                                   \
-       @more_cflags@                                   \
+       @GTK_DEP_CFLAGS@                                \
 @STRIP_END@
 
 gtarget=@gdktarget@
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
+if OS_WIN32
+gtk_def = gtk.def
+gtk_win32_symbols = -export-symbols $(gtk_def)
+
+gtk_win32res_lo = gtk-win32res.lo
+
+gtk-win32res.lo : gtk-win32.rc
+       $(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo
+
+install-libtool-import-lib:
+       $(INSTALL) .libs/libgtk-win32-1.3.dll.a $(DESTDIR)$(libdir)
+uninstall-libtool-import-lib:
+       -rm $(DESTDIR)$(libdir)/libtk-win32-1.3.dll.a
+else
+install-libtool-import-lib:
+uninstall-libtool-import-lib:
+endif
+
+if MS_LIB_AVAILABLE
+noinst_DATA = gtk-win32-1.3.lib
+
+gtk-win32-1.3.lib: libgtk-win32-1.3.la gtk.def
+       lib -name:libgtk-win32-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
+
+install-ms-lib:
+       $(INSTALL) gtk-win32-1.3.lib $(DESTDIR)$(libdir)
+
+uninstall-ms-lib:
+       -rm $(DESTDIR)$(libdir)/gtk-win32-1.3.lib
+else
+install-ms-lib:
+uninstall-ms-lib:
+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
@@ -32,14 +68,13 @@ LDFLAGS = @STRIP_BEGIN@ \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -export-dynamic                                         \
        -rpath @prefix@/lib                                     \
-       @PANGO_LIBS@                                            \
-       @GLIB_DEPLIBS@                                          \
-       @more_ldflags@                                          \
-       @more_libs@                                             \
-       -lm                                                     \
+       $(no_undefined)                                         \
+       @LIBTOOL_EXPORT_OPTIONS@                                \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
+       $(top_builddir)/gdk/@gdktargetlib@                      \
+       @GTK_DEP_LIBS@                                          \
 @STRIP_END@
 
-
 #
 # setup source file variables
 #
@@ -50,9 +85,9 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtk.h                   \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
+       gtkaccessible.h         \
        gtkadjustment.h         \
        gtkalignment.h          \
-       gtkarg.h                \
        gtkarrow.h              \
        gtkaspectframe.h        \
        gtkbin.h                \
@@ -63,21 +98,20 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkcalendar.h           \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
+       gtkseparatormenuitem.h  \
        gtkclist.h              \
        gtkclipboard.h          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombo.h              \
-       gtkcompat.h             \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
        gtkcellrenderer.h       \
+       gtkcelleditable.h       \
        gtkcellrenderertext.h   \
-       gtkcellrenderertextpixbuf.h     \
        gtkcellrenderertoggle.h \
        gtkcellrendererpixbuf.h \
-       gtkdata.h               \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
@@ -103,7 +137,10 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkhsv.h                \
        gtkiconfactory.h        \
        gtkimage.h              \
+       gtkimagemenuitem.h      \
        gtkimcontext.h          \
+       gtkimcontextsimple.h    \
+       gtkimmodule.h           \
        gtkimmulticontext.h     \
        gtkinputdialog.h        \
        gtkinvisible.h          \
@@ -117,18 +154,15 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkmain.h               \
        gtkmenu.h               \
        gtkmenubar.h            \
-       gtkmenufactory.h        \
        gtkmenuitem.h           \
        gtkmenushell.h          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
-       gtkmodelsimple.h        \
        gtknotebook.h           \
+       gtkoldeditable.h        \
        gtkobject.h             \
        gtkoptionmenu.h         \
-       gtkpacker.h             \
        gtkpaned.h              \
-       gdk-pixbuf-loader.h     \
        gtkpixmap.h             \
        gtkplug.h               \
        gtkpreview.h            \
@@ -145,7 +179,9 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtksettings.h           \
        gtksignal.h             \
+       gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
        gtkstyle.h              \
@@ -163,15 +199,17 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtktexttagtable.h       \
        gtktextview.h           \
        gtktext.h               \
-       gtkthemes.h             \
        gtktipsquery.h          \
        gtktogglebutton.h       \
        gtktoolbar.h            \
        gtktooltips.h           \
        gtktree.h               \
+       gtktreednd.h            \
        gtktreeitem.h           \
        gtktreemodel.h          \
+       gtktreemodelsort.h      \
        gtktreeselection.h      \
+       gtktreesortable.h       \
        gtktreestore.h          \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
@@ -197,15 +235,18 @@ gtk_private_h_sources = @STRIP_BEGIN@ \
        gtktextiterprivate.h    \
        gtktextmarkprivate.h    \
        gtktexttagprivate.h     \
+       gtkthemes.h             \
+       gtktreedatalist.h       \
        gtktreeprivate.h        \
+       gtkwindow-decorate.h    \
 @STRIP_END@
 # GTK+ C sources to build the library from
 gtk_c_sources = @STRIP_BEGIN@   \
        gtkaccelgroup.c         \
        gtkaccellabel.c         \
+       gtkaccessible.c         \
        gtkadjustment.c         \
        gtkalignment.c          \
-       gtkarg.c                \
        gtkarrow.c              \
        gtkaspectframe.c        \
        gtkbin.c                \
@@ -215,12 +256,13 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkbutton.c             \
        gtkcalendar.c           \
        gtkcellrenderer.c       \
+       gtkcelleditable.c       \
        gtkcellrenderertext.c   \
-       gtkcellrenderertextpixbuf.c     \
        gtkcellrenderertoggle.c \
        gtkcellrendererpixbuf.c \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
+       gtkseparatormenuitem.c  \
        gtkclipboard.c          \
        gtkclist.c              \
        gtkcolorsel.c           \
@@ -229,7 +271,6 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkcontainer.c          \
        gtkctree.c              \
        gtkcurve.c              \
-       gtkdata.c               \
        gtkdialog.c             \
        gtkdnd.c                \
        gtkdrawingarea.c        \
@@ -253,9 +294,10 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkhsv.c                \
        gtkiconfactory.c        \
        gtkimage.c              \
+       gtkimagemenuitem.c      \
        gtkimcontext.c          \
        gtkimcontextsimple.c    \
-       gtkimcontextsimple.h    \
+       gtkimmodule.c           \
        gtkimmulticontext.c     \
        gtkinputdialog.c        \
        gtkintl.h               \
@@ -270,19 +312,16 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkmain.c               \
        gtkmenu.c               \
        gtkmenubar.c            \
-       gtkmenufactory.c        \
        gtkmenuitem.c           \
        gtkmenushell.c          \
        gtkmessagedialog.c      \
        gtkmisc.c               \
-       gtkmodelsimple.c        \
        gtknotebook.c           \
        gtkobject.c             \
+       gtkoldeditable.c        \
        gtkoptionmenu.c         \
-       gtkpacker.c             \
        gtkpaned.c              \
        gtkpixmap.c             \
-       gtkplug.c               \
        gtkpreview.c            \
        gtkprogress.c           \
        gtkprogressbar.c        \
@@ -297,8 +336,9 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkscrolledwindow.c     \
        gtkselection.c          \
        gtkseparator.c          \
+       gtksettings.c           \
        gtksignal.c             \
-       gtksocket.c             \
+       gtksizegroup.c          \
        gtkspinbutton.c         \
        gtkstock.c              \
        gtkstyle.c              \
@@ -328,8 +368,11 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtktree.c               \
        gtktreeitem.c           \
        gtktreedatalist.c       \
+       gtktreednd.c            \
        gtktreemodel.c          \
+       gtktreemodelsort.c      \
        gtktreeselection.c      \
+       gtktreesortable.c       \
        gtktreestore.c          \
        gtktreeview.c           \
        gtktreeviewcolumn.c     \
@@ -344,32 +387,18 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkvseparator.c         \
        gtkwidget.c             \
        gtkwindow.c             \
+       gtkwindow-decorate.c    \
        fnmatch.c               \
        fnmatch.h               \
-       gdk-pixbuf-loader.c     \
+       xembed.h                \
 @STRIP_END@
-# Extra headers that are used for enum type array/id generation
-gdk_headers = @STRIP_BEGIN@    \
-       ../gdk/gdkcc.h          \
-       ../gdk/gdkcolor.h       \
-       ../gdk/gdkcursor.h      \
-       ../gdk/gdkdnd.h         \
-       ../gdk/gdkdrawable.h    \
-       ../gdk/gdkevents.h      \
-       ../gdk/gdkfont.h        \
-       ../gdk/gdkgc.h          \
-       ../gdk/gdkim.h          \
-       ../gdk/gdkimage.h       \
-       ../gdk/gdkinput.h       \
-       ../gdk/gdkpixmap.h      \
-       ../gdk/gdkproperty.h    \
-       ../gdk/gdkregion.h      \
-       ../gdk/gdkrgb.h         \
-       ../gdk/gdkselection.h   \
-       ../gdk/gdktypes.h       \
-       ../gdk/gdkvisual.h      \
-       ../gdk/gdkwindow.h      \
+
+if USE_X11
+gtk_plug_c_sources = @STRIP_BEGIN@   \
+       gtkplug.c               \
+       gtksocket.c             \
 @STRIP_END@
+endif
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -398,25 +427,21 @@ gtk_built_sources = @STRIP_BEGIN@ \
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
 gtk_extra_sources = @STRIP_BEGIN@ \
-       gtkcompat.h.in          \
-       makeenums.pl            \
-       makeenums.awk           \
+       gtkversion.h.in         \
        maketypes.awk           \
        makeenums.h             \
-       gtkargcollector.c       \
        gtk-boxed.defs          \
        gtkmarshal.list         \
 @STRIP_END@
 
-
 #
 # setup GTK+ sources and their dependancies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources)
-gtk_target_sources = $(gtk_c_sources)
-MAINTAINERCLEANFILES += $(gtk_built_sources)
-EXTRA_HEADERS +=
-EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
+gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
+gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
+MAINTAINERCLEANFILES = $(gtk_built_sources)
+EXTRA_HEADERS =
+EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
 
 #
@@ -424,7 +449,7 @@ EXTRA_DIST += $(gtk_built_sources)
 #
 # setup autogeneration dependancies
 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
-CLEANFILES += $(gen_sources)
+CLEANFILES = $(gen_sources)
 Makefile: oldest-source-stamp  # oh boy, does automake SUCK!
 oldest-source-stamp: $(gtk_built_sources)
 $(OBJECTS): oldest-source-stamp  ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
@@ -437,43 +462,69 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
 # versions in the build dir. thus a development setup requires
 # srcdir to be writable, passing --disable-rebuilds to
 # ../configure will supress all autogeneration rules.
-$(srcdir)/stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
+$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
+       case @GLIB_MKENUMS@ in                                                                  \
+          .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;;                     \
+          *) glib_mkenums=@GLIB_MKENUMS@ ;;                                                    \
+       esac;                                                                                   \
        cd $(srcdir) \
-       && $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) > xgen-gdef \
+       && $$glib_mkenums --comments ";; @comment@" \
+                       --fprod "; enumerations from \"@filename@\"\n " \
+                       --vhead "(define-@type@ @EnumName@" \
+                       --vprod "   (@valuenick@ @VALUENAME@)" \
+                       --vtail ")" \
+                       $(gtk_public_h_sources) > xgen-gdef \
        && cat gtk-boxed.defs >> xgen-gdef \
        && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
        && rm -f xgen-gdef \
        && echo timestamp > $(@F)
 $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
+       case @GLIB_GENMARSHAL@ in                                                                       \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                               \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                                      \
+       esac;                                                                                           \
        cd $(srcdir) \
-       && glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
+       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
        && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $(@F)
 $(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
+       case @GLIB_GENMARSHAL@ in                                                                       \
+          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                               \
+          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                                      \
+       esac;                                                                                           \
        cd $(srcdir) \
-       && glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
+       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \
        && rm -f xgen-gmc xgen-gmc~
-$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins.h
+$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
        cd $(srcdir) \
        && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs
+$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
        cd $(srcdir) \
        && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
        && cp xgen-gtbvc $(@F) \
        && rm -f xgen-gtbvc
-$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
+$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
        cd $(srcdir) \
        && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
        && cp xgen-gtbic $(@F) \
        && rm -f xgen-gtbic
-$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers)
+$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
+       case @GLIB_MKENUMS@ in                                                                  \
+          .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;;                     \
+          *) glib_mkenums=@GLIB_MKENUMS@ ;;                                                    \
+       esac;                                                                                   \
        cd $(srcdir) \
-       && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \
+       && $$glib_mkenums \
+                       --fprod "\n/* enumerations from \"@filename@\" */" \
+                       --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
+                       --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                       --vtail "  { 0, NULL, NULL }\n};" \
+                       $(gtk_public_h_sources) > xgen-gtbec \
        && cp xgen-gtbec $(@F) \
        && rm -f xgen-gtbec
 
@@ -487,105 +538,48 @@ libgtk_x11_includedir = $(includedir)/gtk-2.0/gtk
 libgtk_x11_include_HEADERS = $(gtk_target_headers)
 libgtk_x11_1_3_la_SOURCES = $(gtk_target_sources)
 endif
-if USE_NANOX
-libgtk_nanox_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_nanox_include_HEADERS = $(gtk_target_headers)
-libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources)
-endif
 if USE_LINUX_FB
 libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
 libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
 libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
-
+if USE_WIN32
+libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk
+libgtk_win32_include_HEADERS = $(gtk_target_headers)
+libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
+libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32
+libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
+libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
+endif
+EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
 
-gtkconfdir = $(sysconfdir)/gtk-2.0
-gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
-       gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
-       gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
-       gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 \
-       gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
-       gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii \
-       gtkrc.cp1251
 
 # We create a dummy theme for the default GTK+ theme
-install-data-local:
+install-data-local:  install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-       $(mkinstalldirs) $(DESTDIR)$(gtkconfdir)
-       cd $(DESTDIR)$(gtkconfdir) \
-       && for i in cs hr hu pl ro sk sl sq sr ; do \
-            rm -f gtkrc.$$i ; \
-            ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
-          done \
-       && for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \
-            rm -f gtkrc.$$i ; \
-            ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
-          done \
-       && rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
-                gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
-                gtkrc.be gtkrc.bg \
-       && ln -s gtkrc.iso-8859-13 gtkrc.lt \
-       && ln -s gtkrc.iso-8859-13 gtkrc.lv \
-       && ln -s gtkrc.iso-8859-14 gtkrc.cy \
-       && ln -s gtkrc.iso-8859-14 gtkrc.ga \
-       && ln -s gtkrc.iso-8859-15 gtkrc.et \
-       && ln -s gtkrc.ka_GE.georgianacademy gtkrc.ka \
-       && ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 \
-       && ln -s gtkrc.vi_VN.tcvn gtkrc.vi_VN.tcvn5712 \
-       && ln -s gtkrc.vi_VN.tcvn5712 gtkrc.vi \
-       && ln -s gtkrc.cp1251 gtkrc.be \
-       && ln -s gtkrc.cp1251 gtkrc.bg
-uninstall-local:
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
-#
-# test programs, not to be installed
-#
-noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple treestoretest testtextbuffer # testthreads
-DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la  $(top_builddir)/gdk/@gdktargetlib@
+uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
+DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/@gdktargetlib@
+TEST_DEPS = $(DEPS) gtk.immodules
+
 LDADDS = @STRIP_BEGIN@ \
        @gtktargetlib@                                  \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
        $(top_builddir)/gdk/@gdktargetlib@              \
-       @more_ldflags@                                  \
-       @more_libs@                                     \
-       @GDK_WLIBS@                                     \
-       @PANGO_LIBS@                                    \
-       @GLIB_LIBS@                                     \
-       @GTK_LIBS_EXTRA@                                \
-       -lm                                             \
 @STRIP_END@
 
-testgtk_DEPENDENCIES = $(DEPS)
-testcalendar_DEPENDENCIES = $(DEPS)
-testinput_DEPENDENCIES = $(DEPS)
-testselection_DEPENDENCIES = $(DEPS)
-testrgb_DEPENDENCIES = $(DEPS)
-testtext_DEPENDENCIES = $(DEPS)
-testtextbuffer_DEPENDENCIES = $(DEPS)
-treestoretest_DEPENDENCIES = $(DEPS)
-testdnd_DEPENDENCIES = $(DEPS)
-simple_DEPENDENCIES = $(DEPS)
-#testthreads_DEPENDENCIES = $(DEPS)
-testcalendar_LDADD = $(LDADDS)
-testgtk_LDADD = $(LDADDS)
-testinput_LDADD = $(LDADDS)
-testselection_LDADD = $(LDADDS)
-testtext_LDADD = $(LDADDS)
-treestoretest_LDADD = $(LDADDS)
-testtextbuffer_LDADD = $(LDADDS)
-testrgb_LDADD = $(LDADDS)
-testdnd_LDADD = $(LDADDS)
-simple_LDADD = $(LDADDS)
-#testthreads_LDADD = $(LDADDS)
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.in
-       cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in
-       cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#
+# Installed tools
+#
+bin_PROGRAMS = gtk-query-immodules-2.0
+
+gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS)
+
+gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
 .PHONY: files test test-debug
 
@@ -594,45 +588,22 @@ files:
          echo $$p; \
        done
 
-test: testgtk
-       builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
-       cd $$builddir; cd $(srcdir); \
-       $(SHELL) $$top_builddir/libtool --mode=execute $$builddir/testgtk
-
-test-debug: testgtk
-       builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
-       cd $$builddir; cd $(srcdir); \
-       $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
-
 EXTRA_DIST += @STRIP_BEGIN@    \
        oldest-source-stamp     \
-       testgtk.1               \
-       testgtkrc               \
-       testgtkrc2              \
-       circles.xbm             \
        line-arrow.xbm          \
        line-wrap.xbm           \
        tree_plus.xbm           \
        tree_minus.xbm          \
-       3DRings.xpm             \
-       FilesQueue.xpm          \
-       Modeller.xpm            \
-       check-y.xpm             \
-       check-n.xpm             \
-       marble.xpm              \
        tree_minus.xpm          \
        tree_plus.xpm           \
-       test.xpm                \
-       check-y.xpm             \
-       check-n.xpm             \
-       test.xpm                \
-       gtkcompat.h.win32       \
        gtk.def                 \
-       gtk.rc                  \
+       gtk-win32.rc            \
+       gtk-win32.rc.in         \
        makefile.mingw          \
        makefile.mingw.in       \
        makefile.msc            \
        makefile.msc.in         \
-       $(gtkconf_DATA)         \
 @STRIP_END@
 
+install-data-local:
+