diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-12 09:52:44 -0400 |
| commit | c7514e8f0d19a833257497caff413bb4dfae6eb4 (patch) | |
| tree | 7dc4bbd5b5a162b5b0b0277c68f7b7e3c6dd457b /gdk/Makefile.am | |
| parent | 85c1c22d04d369529ec4c3b6f608270f4f394cb5 (diff) | |
| parent | fcd58b0ffd0935567437b89bb077f60195336764 (diff) | |
| download | gtk+-c7514e8f0d19a833257497caff413bb4dfae6eb4.tar.gz | |
Merge branch 'gdk-backend-wayland'
Conflicts:
Makefile.am
configure.ac
gdk/Makefile.am
gtk/gtksettings.c
gtk/gtkwindow.c
Diffstat (limited to 'gdk/Makefile.am')
| -rw-r--r-- | gdk/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index cc5346b0f8..cb1fd545aa 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -11,7 +11,7 @@ INTROSPECTION_COMPILER_ARGS = \ SUBDIRS = $(GDK_BACKENDS) . tests -DIST_SUBDIRS = win32 x11 quartz broadway tests +DIST_SUBDIRS = win32 x11 quartz broadway wayland tests CLEANFILES = @@ -177,6 +177,10 @@ if USE_BROADWAY libgdk_3_la_LIBADD += broadway/libgdk-broadway.la endif # USE_BROADWAY +if USE_WAYLAND +libgdk_3_la_LIBADD += wayland/libgdk-wayland.la +endif + if HAVE_INTROSPECTION introspection_files = \ |