Skip to content
Permalink
Browse files

Link with Wayland protocols and libraries

Move protocol files to parent's EXTRA_DIST
  • Loading branch information...
wmww authored and raveit65 committed Dec 10, 2018
1 parent b0fb7b5 commit a0d306870068a9cd2d637018275679671d0ec190
Showing with 31 additions and 6 deletions.
  1. +26 −1 mate-panel/Makefile.am
  2. +5 −5 mate-panel/wayland-protocols/Makefile.am
@@ -65,6 +65,12 @@ panel_sources = \
panel-applet-info.c \
panel-reset.c

if ENABLE_WAYLAND
panel_sources += \
wayland-protocols/wlr-layer-shell-unstable-v1-protocol.c \
wayland-protocols/xdg-shell-protocol.c
endif

panel_headers = \
panel-types.h \
panel-widget.h \
@@ -117,6 +123,12 @@ panel_headers = \
panel-reset.h \
panel-schemas.h

if ENABLE_WAYLAND
panel_headers += \
wayland-protocols/wlr-layer-shell-unstable-v1-client-protocol.h \
wayland-protocols/xdg-shell-client-protocol.h
endif

mate_panel_SOURCES = \
$(panel_sources) \
$(panel_headers)
@@ -127,6 +139,12 @@ mate_panel_CPPFLAGS = \
-DPANEL_MODULES_DIR=\"$(modulesdir)\" \
-DMATEMENU_I_KNOW_THIS_IS_UNSTABLE

if ENABLE_WAYLAND
mate_panel_CPPFLAGS += \
$(WAYLAND_CFLAGS)
endif


mate_panel_LDADD = \
$(top_builddir)/mate-panel/libegg/libegg.la \
$(top_builddir)/mate-panel/libmate-panel-applet-private/libmate-panel-applet-private.la \
@@ -137,6 +155,11 @@ mate_panel_LDADD = \
$(X_LIBS) \
-lm

if ENABLE_WAYLAND
mate_panel_LDADD += \
$(WAYLAND_LIBS)
endif

mate_panel_LDFLAGS = -export-dynamic

mate_desktop_item_edit_SOURCES = \
@@ -261,7 +284,9 @@ EXTRA_DIST = \
panel-test-applets.gresource.xml \
panel-marshal.list \
$(entries_DATA) \
$(desktop_in_files)
$(desktop_in_files) \
wayland-protocols/wlr-layer-shell-unstable-v1.xml \
wayland-protocols/xdg-shell.xml

CLEANFILES = \
$(BUILT_SOURCES) \
@@ -1,14 +1,14 @@
if ENABLE_WAYLAND
all: wlr-layer-shell-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.c xdg-shell-protocol.h xdg-shell-protocol.c
all: wlr-layer-shell-unstable-v1-client-protocol.h wlr-layer-shell-unstable-v1-protocol.c xdg-shell-client-protocol.h xdg-shell-protocol.c

wlr-layer-shell-unstable-v1-protocol.h: wlr-layer-shell-unstable-v1.xml
wayland-scanner -c client-header wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
wlr-layer-shell-unstable-v1-client-protocol.h: wlr-layer-shell-unstable-v1.xml
wayland-scanner -c client-header wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-client-protocol.h

wlr-layer-shell-unstable-v1-protocol.c: wlr-layer-shell-unstable-v1.xml
wayland-scanner -c private-code wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.c

xdg-shell-protocol.h: xdg-shell.xml
wayland-scanner -c client-header xdg-shell.xml xdg-shell-protocol.h
xdg-shell-client-protocol.h: xdg-shell.xml
wayland-scanner -c client-header xdg-shell.xml xdg-shell-client-protocol.h

xdg-shell-protocol.c: xdg-shell.xml
wayland-scanner -c private-code xdg-shell.xml xdg-shell-protocol.c

0 comments on commit a0d3068

Please sign in to comment.
You can’t perform that action at this time.