If major.minor of required and available glib versions are the same, add

[~andy/gtk] / modules / engines / ms-windows / Makefile.am

diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 0644ba27ada9722c1c09792c54f850d573bea1fd..bd7a806dc4a6cf8eb6fc48d77cdff895ea348405 100644 (file)
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -2,22 +2,36 @@ SUBDIRS=Theme
 
 EXTRA_DIST=Makefile.msc
 
-INCLUDES=$(WIMP_CFLAGS)
+INCLUDES = \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/gdk                             \
+       -I$(top_builddir)/gdk                           \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGDK_DISABLE_DEPRECATED                        \
+       $(GTK_DEP_CFLAGS)
 
-enginedir=$(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+
+LDADDS = \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
+       $(top_builddir)/gdk/$(gdktargetlib)             \
+       $(top_builddir)/gtk/$(gtktargetlib)             \
+       $(GTK_DEP_LIBS)
+
+enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
 
 engine_LTLIBRARIES = libwimp.la
 
-libwimp_la_SOURCES =           \
-       wimp_rc_style.c         \
-       wimp_rc_style.h         \
-       wimp_style.c            \
-       wimp_style.h            \
-       wimp_theme_main.c       \
+libwimp_la_SOURCES = \
+       msw_rc_style.c          \
+       msw_rc_style.h          \
+       msw_style.c             \
+       msw_style.h             \
+       msw_theme_main.c        \
        xp_theme.c              \
        xp_theme_defs.h         \
        xp_theme.h
 
-libwimp_la_LDFLAGS = -avoid-version -module -no-undefined -export-dynamic
-libwimp_la_LIBADD= $(WIMP_LIBS)
+libwimp_la_LDFLAGS = \
+       -avoid-version -module -no-undefined -export-dynamic
 
+libwimp_la_LIBADD = $(LDADDS) -lgdi32