diff options
| -rw-r--r-- | applets/wncklet/Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | mate-panel/Makefile.am | 5 |
3 files changed, 14 insertions, 14 deletions
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am index 8919ec68..38dfaca5 100644 --- a/applets/wncklet/Makefile.am +++ b/applets/wncklet/Makefile.am @@ -23,22 +23,23 @@ WNCKLET_SOURCES = \ showdesktop.h \ $(BUILT_SOURCES) +WNCKLET_LDADD = \ + ../../libmate-panel-applet/libmate-panel-applet-4.la \ + $(WNCKLET_LIBS) \ + $(LIBMATE_PANEL_APPLET_LIBS) + if ENABLE_WAYLAND WNCKLET_SOURCES += \ wayland-backend.c \ wayland-backend.h \ wayland-protocol/wlr-foreign-toplevel-management-unstable-v1-code.c \ wayland-protocol/wlr-foreign-toplevel-management-unstable-v1-client.h -endif -WNCKLET_LDADD = \ - ../../libmate-panel-applet/libmate-panel-applet-4.la \ - $(WNCKLET_LIBS) \ - $(LIBMATE_PANEL_APPLET_LIBS) - -if ENABLE_WAYLAND WNCKLET_LDADD += \ - -lwayland-client + $(WAYLAND_LIBS) + +AM_CPPFLAGS += \ + $(WAYLAND_CFLAGS) endif if WNCKLET_INPROCESS diff --git a/configure.ac b/configure.ac index 3d3ec256..4772dff6 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,7 @@ AC_ARG_ENABLE(wayland, # Check if we have gtk-layer-shell installed, and thus should build with Wayland support have_wayland=no if test "x$enable_wayland" != "xno"; then - PKG_CHECK_MODULES(GTK_LAYER_SHELL, gtk-layer-shell-0, have_wayland=yes, [ + PKG_CHECK_MODULES(WAYLAND, gtk-layer-shell-0 wayland-client, have_wayland=yes, [ if test "x$enable_wayland" = "xyes"; then AC_MSG_ERROR([Wayland enabled but GTK Layer Shell library not found]) fi @@ -207,8 +207,8 @@ if test "x$have_wayland" = "xyes"; then AC_DEFINE(HAVE_WAYLAND, 1, [Have the Wayland development library]) fi -AC_SUBST(GTK_LAYER_SHELL_CFLAGS) -AC_SUBST(GTK_LAYER_SHELL_LIBS) +AC_SUBST(WAYLAND_CFLAGS) +AC_SUBST(WAYLAND_LIBS) # Check if we have the X development libraries have_x11=no diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index 2738a67b..1a2a8ee3 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -16,7 +16,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DPANELDATADIR=\""$(datadir)/mate-panel"\" \ $(DISABLE_DEPRECATED_CFLAGS) \ - $(GTK_LAYER_SHELL_CFLAGS) + $(WAYLAND_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) @@ -152,7 +152,6 @@ mate_panel_CPPFLAGS += \ $(WAYLAND_CFLAGS) endif - mate_panel_LDADD = \ $(top_builddir)/mate-panel/mate-submodules/libegg/libegg.la \ $(top_builddir)/mate-panel/libmate-panel-applet-private/libmate-panel-applet-private.la \ @@ -161,7 +160,7 @@ mate_panel_LDADD = \ $(DCONF_LIBS) \ $(XRANDR_LIBS) \ $(X_LIBS) \ - $(GTK_LAYER_SHELL_LIBS) \ + $(WAYLAND_LIBS) \ -lm if ENABLE_WAYLAND |