]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
remove unecessary rules for win32-specific config-substituted targets. If
[~andy/gtk] / gtk / Makefile.am
index cb59e29e4fddd88b637589c436351cf4b5f71754..262dd0a2e69574269b2fa0336fa79d2cb402a298 100644 (file)
@@ -1,4 +1,6 @@
-## Makefile.am for gtk+/gtk
+# Makefile.am for gtk+/gtk
+
+SUBDIRS=stock-icons
 
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
@@ -7,9 +9,12 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
        -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
+       -DGTK_VERSION=\"@GTK_VERSION@\"                 \
+       -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"  \
+       -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
-       -I$(top_srcdir)/gdk/x11                         \
+       -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
        @GTK_LOCALE_FLAGS@                              \
@@ -23,10 +28,9 @@ gtarget=@gdktarget@
 # 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
+libgtkincludedir = $(includedir)/gtk-2.0/gtk
 LDFLAGS = @STRIP_BEGIN@ \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-       -release $(LT_RELEASE)                                  \
        -export-dynamic                                         \
        -rpath @prefix@/lib                                     \
        @PANGO_LIBS@                                            \
@@ -35,15 +39,14 @@ LDFLAGS = @STRIP_BEGIN@ \
        @more_libs@                                             \
        -lm                                                     \
 @STRIP_END@
-#      $(top_builddir)/gdk/libgdk.la
 
 
 #
 # setup source file variables
 #
+
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
-
 gtk_public_h_sources = @STRIP_BEGIN@ \
        gtk.h                   \
        gtkaccelgroup.h         \
@@ -62,6 +65,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
        gtkclist.h              \
+       gtkclipboard.h          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombo.h              \
@@ -69,6 +73,11 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
+       gtkcellrenderer.h       \
+       gtkcellrenderertext.h   \
+       gtkcellrenderertextpixbuf.h     \
+       gtkcellrenderertoggle.h \
+       gtkcellrendererpixbuf.h \
        gtkdata.h               \
        gtkdebug.h              \
        gtkdialog.h             \
@@ -78,7 +87,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkentry.h              \
        gtkenums.h              \
        gtkeventbox.h           \
-       gtkfeatures.h           \
        gtkfilesel.h            \
        gtkfixed.h              \
        gtkfontsel.h            \
@@ -94,8 +102,10 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
        gtkhsv.h                \
+       gtkiconfactory.h        \
        gtkimage.h              \
        gtkimcontext.h          \
+       gtkimmodule.h           \
        gtkimmulticontext.h     \
        gtkinputdialog.h        \
        gtkinvisible.h          \
@@ -105,18 +115,23 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtklayout.h             \
        gtklist.h               \
        gtklistitem.h           \
+       gtkliststore.h          \
        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            \
@@ -138,22 +153,31 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkspinbutton.h         \
        gtkstyle.h              \
        gtkstatusbar.h          \
+       gtkstock.h              \
        gtktable.h              \
        gtktearoffmenuitem.h    \
        gtktextbuffer.h         \
+       gtktextchild.h          \
+       gtktextdisplay.h        \
        gtktextiter.h           \
+       gtktextlayout.h         \
        gtktextmark.h           \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
        gtktext.h               \
-       gtkthemes.h             \
        gtktipsquery.h          \
        gtktogglebutton.h       \
        gtktoolbar.h            \
        gtktooltips.h           \
        gtktree.h               \
        gtktreeitem.h           \
+       gtktreemodel.h          \
+       gtktreemodelsort.h      \
+       gtktreeselection.h      \
+       gtktreestore.h          \
+       gtktreeview.h           \
+       gtktreeviewcolumn.h     \
        gtktypeutils.h          \
        gtkvbbox.h              \
        gtkvbox.h               \
@@ -166,28 +190,22 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkwidget.h             \
        gtkwindow.h             \
 @STRIP_END@
-
-#
-# GTK+ header files that we install, but don't extract enums from
-# (This class is iffy; we have it for the semi-public interface
-# of the Text widget, which is useful for writing new view types
-# such as a Canvas text item, but isn't part of the clean public
-# interface)
-
-gtk_semipublic_h_sources = @STRIP_BEGIN@ \
+# GTK+ header files that don't get installed
+gtk_private_h_sources = @STRIP_BEGIN@ \
+       gtkrbtree.h             \
        gtktextbtree.h          \
-       gtktextchild.h          \
-       gtktextdisplay.h        \
-       gtktextlayout.h         \
+       gtktextchildprivate.h   \
        gtktextsegment.h        \
        gtktexttypes.h          \
-@STRIP_END@    
-
-# GTK+ header files that don't get installed
-gtk_private_h_sources = @STRIP_BEGIN@ \
+       gtktextiterprivate.h    \
+       gtktextmarkprivate.h    \
+       gtktexttagprivate.h     \
+       gtkthemes.h             \
+       gtktreedatalist.h       \
+       gtktreeprivate.h        \
 @STRIP_END@
 # GTK+ C sources to build the library from
-gtk_c_sources = @STRIP_BEGIN@ \
+gtk_c_sources = @STRIP_BEGIN@   \
        gtkaccelgroup.c         \
        gtkaccellabel.c         \
        gtkadjustment.c         \
@@ -201,8 +219,14 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtkbox.c                \
        gtkbutton.c             \
        gtkcalendar.c           \
+       gtkcellrenderer.c       \
+       gtkcellrenderertext.c   \
+       gtkcellrenderertextpixbuf.c     \
+       gtkcellrenderertoggle.c \
+       gtkcellrendererpixbuf.c \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
+       gtkclipboard.c          \
        gtkclist.c              \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
@@ -232,10 +256,12 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
        gtkhsv.c                \
+       gtkiconfactory.c        \
        gtkimage.c              \
        gtkimcontext.c          \
        gtkimcontextsimple.c    \
        gtkimcontextsimple.h    \
+       gtkimmodule.c           \
        gtkimmulticontext.c     \
        gtkinputdialog.c        \
        gtkintl.h               \
@@ -246,16 +272,19 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtklayout.c             \
        gtklist.c               \
        gtklistitem.c           \
+       gtkliststore.c          \
        gtkmain.c               \
-       gtkmarshal.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              \
@@ -267,6 +296,7 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtkradiobutton.c        \
        gtkradiomenuitem.c      \
        gtkrange.c              \
+       gtkrbtree.c             \
        gtkrc.c                 \
        gtkruler.c              \
        gtkscale.c              \
@@ -277,6 +307,7 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtksignal.c             \
        gtksocket.c             \
        gtkspinbutton.c         \
+       gtkstock.c              \
        gtkstyle.c              \
        gtkstatusbar.c          \
        gtktable.c              \
@@ -293,7 +324,6 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtktextmarkprivate.h    \
        gtktextsegment.c        \
        gtktexttag.c            \
-       gtktexttagprivate.h     \
        gtktexttagtable.c       \
        gtktexttypes.c          \
        gtktextview.c           \
@@ -304,6 +334,13 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtktooltips.c           \
        gtktree.c               \
        gtktreeitem.c           \
+       gtktreedatalist.c       \
+       gtktreemodel.c          \
+       gtktreemodelsort.c      \
+       gtktreeselection.c      \
+       gtktreestore.c          \
+       gtktreeview.c           \
+       gtktreeviewcolumn.c     \
        gtktypeutils.c          \
        gtkvbbox.c              \
        gtkvbox.c               \
@@ -317,13 +354,42 @@ gtk_c_sources = @STRIP_BEGIN@ \
        gtkwindow.c             \
        fnmatch.c               \
        fnmatch.h               \
+       gdk-pixbuf-loader.c     \
+@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      \
 @STRIP_END@
+
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
 # we generate frequently rebuild files piggyback on a stamp file, so sources
 # depending on them only get rebuild when the built source actually changed
 # content
-#
+
+# built sources that get installed with the header files
+gtk_built_public_sources = @STRIP_BEGIN@ \
+       gtkmarshal.h            \
+       gtktypebuiltins.h       \
+@STRIP_END@
 # built sources that don't get installed
 gtk_built_sources = @STRIP_BEGIN@ \
        stamp-gtk.defs          \
@@ -334,12 +400,7 @@ gtk_built_sources = @STRIP_BEGIN@ \
        gtktypebuiltins_evals.c \
        gtkmarshal.c            \
        gtk.defs                \
-@STRIP_END@
-# built sources that get installed with the header files
-gtk_built_public_sources = @STRIP_BEGIN@ \
-       gtkcompat.h             \
-       gtkmarshal.h            \
-       gtktypebuiltins.h       \
+       ${gtk_built_public_sources} \
 @STRIP_END@
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
@@ -352,66 +413,19 @@ gtk_extra_sources = @STRIP_BEGIN@ \
        makeenums.h             \
        gtkargcollector.c       \
        gtk-boxed.defs          \
-       genmarshal.pl           \
        gtkmarshal.list         \
 @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      \
-@STRIP_END@
+
 
 #
 # setup GTK+ sources and their dependancies
 #
-all_headers = $(gtk_public_h_sources) $(gtk_semipublic_h_sources) $(gtk_built_public_sources)
-all_sources = $(gtk_c_sources)
-
-extra = @gtktargetlib@
-if USE_X11
-libgtk_x11_includedir = $(includedir)/gtk
-libgtk_x11_include_HEADERS = $(all_headers)
-libgtk_x11_la_SOURCES = $(all_sources)
-endif
-
-if USE_NANOX
-libgtk_nanox_includedir = $(includedir)/gtk
-libgtk_nanox_include_HEADERS = $(all_headers)
-libgtk_nanox_la_SOURCES = $(all_sources)
-endif
-
-if USE_LINUX_FB
-libgtk_linux_fb_includedir = $(includedir)/gtk
-libgtk_linux_fb_include_HEADERS = $(all_headers)
-libgtk_linux_fb_la_SOURCES = $(all_sources)
-endif
-
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(extra)
-
-EXTRA_LTLIBRARIES = libgtk-x11.la libgtk-nanox.la libgtk-linux-fb.la
-
-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
+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)
-EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
+EXTRA_DIST += $(gtk_built_sources)
 
 #
 # rules to generate built sources
@@ -419,13 +433,14 @@ EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sourc
 # setup autogeneration dependancies
 gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
 CLEANFILES += $(gen_sources)
-OLD_STAMP: $(gtk_built_public_sources) $(gtk_built_sources)
-$(OBJECTS): OLD_STAMP  # this is our oldest-source-stamp
+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
 # initial creation of the real stamp-* files
 gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
        test -f "$(srcdir)/$@" || touch $(srcdir)/$@
 # normal autogeneration rules
-# all autogenerated files need to generated in the srcdir,
+# all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
 # versions in the build dir. thus a development setup requires
 # srcdir to be writable, passing --disable-rebuilds to
@@ -437,30 +452,31 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_p
        && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
        && rm -f xgen-gdef \
        && echo timestamp > $(@F)
-$(srcdir)/gtkmarshal.c: stamp-gtkmarshal.h
-$(srcdir)/gtkmarshal.c $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list gtkmarshal.h
+$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
        cd $(srcdir) \
-       && $(PERL) genmarshal.pl gtkmarshal.list xgen-gmh xgen-gmc \
-       && (test -z "$(INDENT)" || $(INDENT) xgen-gmh) \
-       && (test -z "$(INDENT)" || $(INDENT) xgen-gmc) \
-       && cp xgen-gmc gtkmarshal.c \
+       && 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-gmc xgen-gmh~ xgen-gmc~ \
-       && echo timestamp > stamp-gtkmarshal.h
+       && rm -f xgen-gmh xgen-gmh~ \
+       && echo timestamp > $(@F)
+$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
+       cd $(srcdir) \
+       && 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
        cd $(srcdir) \
-       && $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
+       && 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
        cd $(srcdir) \
-       && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
+       && 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
        cd $(srcdir) \
-       && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
+       && 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)
@@ -470,76 +486,123 @@ $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources
        && rm -f xgen-gtbec
 
 
-gtkconfdir = $(sysconfdir)/gtk
-gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
+# target platform:
+lib_ltlibraries = @gtktargetlib@
+# now define the real one to workaround automake's mishandling
+lib_LTLIBRARIES = $(lib_ltlibraries)
+if USE_X11
+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
+
+
+gtkconfdir = $(sysconfdir)/gtk-2.0
+gtkconf_DATA = gtkrc.az 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.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.vi_VN.tcvn gtkrc.vi_VN.viscii \
+       gtkrc.cp1251 gtk.immodules
 
 # We create a dummy theme for the default GTK+ theme
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk
-       echo "# Empty gtkrc for default theme" > \
-           $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc
+       $(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 ; do \
-           rm -f gtkrc.$$i ; \
-           ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
-         done ; \
-         for i in bg_BG.iso88595 mk sr 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 ; \
-       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 
-
+       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 gtkrc.mi \
+       && ln -s gtkrc.iso-8859-13 gtkrc.mi \
+       && 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.georgianps 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/gtkrc
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+
+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@
+
+#
+# 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
+
+gtk.immodules: gtk-query-immodules-2.0
+       ./gtk-query-immodules-2.0 ../modules/input/.libs/*.so > gtk.immodules
 
 #
 # test programs, not to be installed
 #
-noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple testtextbuffer # testthreads
-DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
-LDADDS = @STRIP_BEGIN@ \
-       libgtk.la                       \
-       $(top_builddir)/gdk/libgdk.la   \
-       @x_ldflags@                     \
-       @x_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)
-testdnd_DEPENDENCIES = $(DEPS)
-simple_DEPENDENCIES = $(DEPS)
-#testthreads_DEPENDENCIES = $(DEPS)
+noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple treestoretest testtextbuffer # testthreads
+
+testcalendar_DEPENDENCIES = $(TEST_DEPS)
+testgtk_DEPENDENCIES = $(TEST_DEPS)
+testinput_DEPENDENCIES = $(TEST_DEPS)
+testrgb_DEPENDENCIES = $(TEST_DEPS)
+testselection_DEPENDENCIES = $(TEST_DEPS)
+testtext_DEPENDENCIES = $(TEST_DEPS)
+testtextbuffer_DEPENDENCIES = $(TEST_DEPS)
+treestoretest_DEPENDENCIES = $(TEST_DEPS)
+testdnd_DEPENDENCIES = $(TEST_DEPS)
+simple_DEPENDENCIES = $(TEST_DEPS)
+#testthreads_DEPENDENCIES = $(TEST_DEPS)
+
 testcalendar_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
 testinput_LDADD = $(LDADDS)
+testrgb_LDADD = $(LDADDS)
 testselection_LDADD = $(LDADDS)
 testtext_LDADD = $(LDADDS)
 testtextbuffer_LDADD = $(LDADDS)
-testrgb_LDADD = $(LDADDS)
+treestoretest_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
 #testthreads_LDADD = $(LDADDS)
@@ -562,7 +625,7 @@ test-debug: testgtk
        $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
 
 EXTRA_DIST += @STRIP_BEGIN@    \
-       OLD_STAMP               \
+       oldest-source-stamp     \
        testgtk.1               \
        testgtkrc               \
        testgtkrc2              \
@@ -584,6 +647,12 @@ EXTRA_DIST += @STRIP_BEGIN@        \
        check-n.xpm             \
        test.xpm                \
        gtk.def                 \
+       gtk-win32.rc            \
+       gtk-win32.rc.in         \
+       makefile.mingw          \
+       makefile.mingw.in       \
        makefile.msc            \
+       makefile.msc.in         \
        $(gtkconf_DATA)         \
 @STRIP_END@
+