System fnmatch wasn't going to be UTF-8 clean, neither was our version.

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 817a7bdacb76e966c7149c565a8ca3a1c5e2a03d..d5521d2004f105c4ff19c468e9dbe423d4e9bb6b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
-       -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        -DGTK_VERSION=\"@GTK_VERSION@\"                 \
        -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"   \
        -DGTK_HOST=\"@host@\"                           \
@@ -16,6 +15,10 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
+       -DG_DISABLE_DEPRECATED                          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
 @STRIP_END@
@@ -65,6 +68,7 @@ endif
 # we use the general approach here
 libgtkincludedir = $(includedir)/gtk-2.0/gtk
 LDFLAGS = @STRIP_BEGIN@ \
+       @LDFLAGS@                                                               \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)                    \
        -export-dynamic                                                         \
        -rpath $(libdir)                                                        \
@@ -530,7 +534,7 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
        && echo timestamp > $(@F)
 $(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
        ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
+                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
                        --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@\" }," \
@@ -550,7 +554,7 @@ libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
 libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
 
 libgtk_win32_2_0_la_LIBADD = $(gtk_win32res_lo)
-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def)
+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
 
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32
@@ -565,14 +569,16 @@ endif
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-       $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+       $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
-       $(INSTALL) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+       $(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) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
        rm -f $(DESTDIR)$(datadir)/themes/Default/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
 
 DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)