diff options
| author | Kristian Rietveld <kris@gtk.org> | 2010-12-22 15:07:12 +0100 |
|---|---|---|
| committer | Kristian Rietveld <kris@gtk.org> | 2010-12-22 15:07:12 +0100 |
| commit | 0d9b67dc7651e49ef6dfee05f6e95bd181267d22 (patch) | |
| tree | fed78c4ca701c8868d2f093bb8f047d51b786bff | |
| parent | d588398ff5af9d9e727e36523e90c0dd9d0025f8 (diff) | |
| download | gtk+-0d9b67dc7651e49ef6dfee05f6e95bd181267d22.tar.gz | |
gdk: Fix toplevel makefile to build non-x11 backends again
| -rw-r--r-- | gdk/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 21c81fabae..4d3a92ea5e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -156,17 +156,23 @@ common_sources = \ gdkmarshalers.h libgdk_3_0_la_SOURCES = $(common_sources) -libgdk_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) +libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS) libgdk_3_0_la_LDFLAGS = $(LDADD) -libgdk_quartz_3_0_la_SOURCES = $(common_sources) -libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) -libgdk_quartz_3_0_la_LDFLAGS = $(LDADD) +if USE_X11 +libgdk_3_0_la_LIBADD += x11/libgdk-x11.la +endif # USE_X11 + +if USE_QUARTZ +libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la +endif # USE_QUARTZ -libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) -libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def -libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) +if USE_WIN32 +libgdk_3_0_la_SOURCES += gdkkeynames.c +libgdk_3_0_la_LIBADD += win32/libgdk-win32.la +libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def +libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def +endif # USE_WIN32 if HAVE_INTROSPECTION |