Make 3.0 parallel-installable to 2.x

[~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 3c9ef26ca19d5ae9507cdbce57593bdb7156baf0..663616deabfc95137a0df79cc224e20f22aa9494 100644 (file)
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -5,21 +5,20 @@ SUBDIRS=Theme
 EXTRA_DIST += Makefile.msc
 
 INCLUDES = \
-       -I$(top_srcdir)                                 \
-       -I$(top_srcdir)/gdk                             \
-       -I$(top_builddir)/gdk                           \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
-       -DGDK_DISABLE_DEPRECATED                        \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/gdk             \
+       -I$(top_builddir)/gdk           \
+       -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEP_CFLAGS)
 
 
 LDADDS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-3.0.la \
        $(top_builddir)/gdk/$(gdktargetlib)             \
        $(top_builddir)/gtk/$(gtktargetlib)             \
        $(GTK_DEP_LIBS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
 
 engine_LTLIBRARIES = libwimp.la
 
@@ -37,3 +36,5 @@ libwimp_la_LDFLAGS = \
        -avoid-version -module -no-undefined -export-dynamic
 
 libwimp_la_LIBADD = $(LDADDS) -lgdi32
+
+-include $(top_srcdir)/git.mk