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 ee0c275956624697f8f1ab6803ab7523b096ef5f..1432182693b7a2cd646154eee949d45eb501c8d5 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -1,109 +1,63 @@
-EXTRA_DIST = \
-       makefile.mingw \
-       makefile.msc \
-       gdkcc-win32.c \
+## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
+
+libgdkincludedir = $(includedir)/gtk-2.0/gdk
+
+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
+
+LDADDS = $(GDK_DEP_LIBS)
+
+noinst_LTLIBRARIES = libgdk-win32.la
+
+SUBDIRS=rc
+
+EXTRA_DIST += \
+       bdfcursor.c \
+       makefile.msc
+
+libgdk_win32_la_SOURCES = \
+       xcursors.h \
        gdkcolor-win32.c \
        gdkcursor-win32.c \
+       gdkdisplay-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 \
        gdkpixmap-win32.c \
+       gdkpixmap-win32.h \
        gdkprivate-win32.h \
        gdkproperty-win32.c \
-       gdkregion-win32.c \
+       gdkscreen-win32.c \
        gdkselection-win32.c \
+       gdkspawn-win32.c \
        gdkvisual-win32.c \
        gdkwin32.h \
        gdkwin32id.c \
        gdkwindow-win32.c \
-       surrogate-dimm.h \
-       rc/gdk.rc \
-       rc/gtk.ico \
-       rc/cursor00.cur \
-       rc/cursor02.cur \
-       rc/cursor04.cur \
-       rc/cursor06.cur \
-       rc/cursor08.cur \
-       rc/cursor0a.cur \
-       rc/cursor0c.cur \
-       rc/cursor0e.cur \
-       rc/cursor10.cur \
-       rc/cursor12.cur \
-       rc/cursor14.cur \
-       rc/cursor16.cur \
-       rc/cursor18.cur \
-       rc/cursor1a.cur \
-       rc/cursor1c.cur \
-       rc/cursor1e.cur \
-       rc/cursor20.cur \
-       rc/cursor22.cur \
-       rc/cursor24.cur \
-       rc/cursor26.cur \
-       rc/cursor28.cur \
-       rc/cursor2a.cur \
-       rc/cursor2c.cur \
-       rc/cursor2e.cur \
-       rc/cursor30.cur \
-       rc/cursor32.cur \
-       rc/cursor34.cur \
-       rc/cursor36.cur \
-       rc/cursor38.cur \
-       rc/cursor3a.cur \
-       rc/cursor3c.cur \
-       rc/cursor3e.cur \
-       rc/cursor40.cur \
-       rc/cursor42.cur \
-       rc/cursor44.cur \
-       rc/cursor46.cur \
-       rc/cursor48.cur \
-       rc/cursor4a.cur \
-       rc/cursor4c.cur \
-       rc/cursor4e.cur \
-       rc/cursor50.cur \
-       rc/cursor52.cur \
-       rc/cursor54.cur \
-       rc/cursor56.cur \
-       rc/cursor58.cur \
-       rc/cursor5a.cur \
-       rc/cursor5c.cur \
-       rc/cursor5e.cur \
-       rc/cursor60.cur \
-       rc/cursor62.cur \
-       rc/cursor64.cur \
-       rc/cursor66.cur \
-       rc/cursor68.cur \
-       rc/cursor6a.cur \
-       rc/cursor6c.cur \
-       rc/cursor6e.cur \
-       rc/cursor70.cur \
-       rc/cursor72.cur \
-       rc/cursor74.cur \
-       rc/cursor76.cur \
-       rc/cursor78.cur \
-       rc/cursor7a.cur \
-       rc/cursor7c.cur \
-       rc/cursor7e.cur \
-       rc/cursor80.cur \
-       rc/cursor82.cur \
-       rc/cursor84.cur \
-       rc/cursor86.cur \
-       rc/cursor88.cur \
-       rc/cursor8a.cur \
-       rc/cursor8c.cur \
-       rc/cursor8e.cur \
-       rc/cursor90.cur \
-       rc/cursor92.cur \
-       rc/cursor94.cur \
-       rc/cursor96.cur \
-       rc/cursor98.cur
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gdk/win32/makefile.mingw.in
-       cd $(top_builddir) && CONFIG_FILES=gdk/win32/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+       gdkwindow-win32.h \
+       wintab.h \
+       pktdef.h
 
+libgdkinclude_HEADERS =                \
+       gdkwin32.h