Use correct DLL and import library names, with GTK_API_VERSION in name,

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1d4181f5ac8fb25f508fd7015166b59d562adc5d..f33a518c54c98ffcf7beb0b26c3876b7a37a7461 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -7,19 +7,20 @@ EXTRA_DIST =                  \
        gdkconfig.h.win32       \
        gdk.def                 \
        gdkmarshalers.list      \
-       makefile.mingw          \
-       makefile.mingw.in       \
        makeenums.pl            \
        makefile.msc
 
 common_includes = @STRIP_BEGIN@        \
        -DG_LOG_DOMAIN=\"Gdk\"          \
+       -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
+       -DG_DISABLE_DEPRECATED          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED        \
        @GTK_DEBUG_FLAGS@               \
        @GDK_DEP_CFLAGS@                \
-       -DGDK_COMPILATION               \
 @STRIP_END@
 
 INCLUDES = $(common_includes)
@@ -77,7 +78,6 @@ LDFLAGS = @STRIP_BEGIN@                                               \
        @LIBTOOL_EXPORT_OPTIONS@                                        \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(gdk_win32_symbols)                                            \
-       @GDK_DEP_LIBS@                                                  \
 @STRIP_END@
 
 #
@@ -128,6 +128,7 @@ gdk_c_sources = @STRIP_BEGIN@       \
        gdkcolor.c              \
        gdkcursor.c             \
        gdkdisplay.c            \
+       gdkdnd.c                \
        gdkdraw.c               \
        gdkevents.c             \
        gdkfont.c               \
@@ -162,15 +163,22 @@ gdk_c_sources = @STRIP_BEGIN@     \
 gdkincludedir = $(includedir)/gtk-2.0/gdk
 gdkinclude_HEADERS = $(gdk_headers)
 
-# gdkmarshalers.c is commented out becuase it is currently an empty file
-libgdk_x11_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gdkmarshalers.c
-libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c gdkmarshalers.h # gdkmarshalers.c
-libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c # gdkmarshalers.c
+# gdkmarshalers.c is not here becuase it is currently an empty file
+common_sources = @STRIP_BEGIN@ \
+       $(gdk_c_sources)        \
+       gdkenumtypes.c          \
+       gdkmarshalers.h         \
+@STRIP_END@
+
+libgdk_x11_2_0_la_SOURCES = $(common_sources)
+libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la   
-libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la    
+libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la @GDK_DEP_LIBS@
+libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la @GDK_DEP_LIBS@
 libgdk_win32_2_0_la_LIBADD = \
-       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib)
+       win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) \
+       @GDK_DEP_LIBS@
 
 lib_LTLIBRARIES = $(gdktargetlib)