wayland: Handle blank cursor

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

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 92c7a35d485501534a60b446835433ac05833abc..404ddd6aefa7a09603d72ee4c85fd6c762faddf9 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,84 +1,68 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-2.0/gdk
+libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES = @STRIP_BEGIN@       \
+INCLUDES = \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DINSIDE_GDK_WIN32      \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       @GTK_DEBUG_FLAGS@       \
-       @GDK_DEP_CFLAGS@        \
-       @GDK_WIN32_EXTRA_CFLAGS@\
-       -DGDK_COMPILATION       \
-@STRIP_END@
+       $(GTK_DEBUG_FLAGS)      \
+       $(GDK_DEP_CFLAGS)       \
+       $(GDK_WIN32_EXTRA_CFLAGS)\
+       -DGDK_COMPILATION
 
-LDADDS = @STRIP_BEGIN@                 \
-       @GDK_DEP_LIBS@          \
-@STRIP_END@
-
-if HAVE_WINTAB
-libwntab32x_a = .libs/libwntab32x.a
-
-.libs/libwntab32x.a: @WINTAB_LIB@
-       cp $< $@
-endif
-
-if HAVE_IE55
-libie55uuid_a = .libs/libie55uuid.a
-
-.libs/libie55uuid.a: @IE55_UUID_LIB@
-       cp $< $@
-endif
-
-noinst_DATA = $(libwntab32x_a) $(libie55uuid_a)
+LDADDS = $(GDK_DEP_LIBS)
 
 noinst_LTLIBRARIES = libgdk-win32.la
 
 SUBDIRS=rc
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        bdfcursor.c \
-       makefile.mingw  \
-       makefile.msc    \
-       libie55uuid.la  \
-       libwntab32x.la
+       makefile.msc
 
 libgdk_win32_la_SOURCES = \
-       xcursors.h \
-       gdkcolor-win32.c \
        gdkcursor-win32.c \
+       gdkdevicemanager-win32.c \
+       gdkdevicemanager-win32.h \
+       gdkdevice-win32.c \
+       gdkdevice-win32.h \
+       gdkdevice-wintab.c \
+       gdkdevice-wintab.h \
        gdkdisplay-win32.c \
+       gdkdisplaymanager-win32.c \
        gdkdnd-win32.c \
-       gdkdrawable-win32.c \
-       gdkdrawable-win32.h \
        gdkevents-win32.c \
-       gdkfont-win32.c \
-       gdkgc-win32.c \
        gdkgeometry-win32.c \
        gdkglobals-win32.c \
-       gdkim-win32.c \
-       gdkimage-win32.c \
        gdkinput.c \
-       gdkinput-win32.c \
-       gdkinput-win32.h \
        gdkkeys-win32.c \
        gdkmain-win32.c \
-       gdkpango-win32.c \
-       gdkpixmap-win32.c \
-       gdkpixmap-win32.h \
        gdkprivate-win32.h \
        gdkproperty-win32.c \
        gdkscreen-win32.c \
        gdkselection-win32.c \
+       gdktestutils-win32.c \
        gdkvisual-win32.c \
+       gdkwin32cursor.h \
+       gdkwin32display.h \
+       gdkwin32displaymanager.h \
+       gdkwin32dnd.h \
        gdkwin32.h \
        gdkwin32id.c \
+       gdkwin32keys.h \
+       gdkwin32screen.h \
+       gdkwin32window.h \
        gdkwindow-win32.c \
-       gdkwindow-win32.h
+       gdkwindow-win32.h \
+       pktdef.h \
+       wintab.h \
+       xcursors.h
 
 libgdkinclude_HEADERS =                \
        gdkwin32.h
 
-libgdk_win32_la_LIBADD = rc/gdk-win32res.lo
+-include $(top_srcdir)/git.mk