call g_test_init() from gtk_test_init().

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

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 07a090a441f99eb518c657e02732e1a3993dcbd2..1432182693b7a2cd646154eee949d45eb501c8d5 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,49 +1,28 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-2.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 \
@@ -65,31 +44,20 @@ libgdk_win32_la_SOURCES = \
        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 \
+       gdkspawn-win32.c \
        gdkvisual-win32.c \
        gdkwin32.h \
        gdkwin32id.c \
        gdkwindow-win32.c \
-       gdkwindow-win32.h
+       gdkwindow-win32.h \
+       wintab.h \
+       pktdef.h
 
 libgdkinclude_HEADERS =                \
        gdkwin32.h
-
-libgdk_win32_la_LIBADD = rc/gdk-win32res.lo
-
-###########################################
-# Hack to get gdkenumtypes.h built first
-###########################################
-                                       
-$(libgdk_win32_la_OBJECTS): update-enum-types
-
-update-enum-types:
-       @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h
-   
-.PHONY: update-enum-types