From 2215dd89012d8075fdf028e8d95dfd3990b99a93 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 1 Feb 2017 11:29:40 -0600 Subject: [PATCH] build: Fix screw up with wayland header auto generation --- src/Makefile_Ecore_IMF.am | 4 +++- src/Makefile_Ecore_Wl2.am | 22 ++++++++++++---------- src/Makefile_Evas.am | 7 ++++++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am index 5a07d60..8b9c9e9 100644 --- a/src/Makefile_Ecore_IMF.am +++ b/src/Makefile_Ecore_IMF.am @@ -133,7 +133,9 @@ $(install_ecoreimfwaylandpkgLTLIBRARIES): install-libLTLIBRARIES modules_ecore_imf_wayland_module_la_SOURCES = \ modules/ecore_imf/wayland/wayland_module.c \ modules/ecore_imf/wayland/wayland_imcontext.c \ -modules/ecore_imf/wayland/wayland_imcontext.h \ +modules/ecore_imf/wayland/wayland_imcontext.h + +nodist_modules_ecore_imf_wayland_module_la_SOURCES = \ modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \ modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am index 7e0789f..bf05033 100644 --- a/src/Makefile_Ecore_Wl2.am +++ b/src/Makefile_Ecore_Wl2.am @@ -8,6 +8,17 @@ installed_ecorewl2mainheadersdir = $(includedir)/ecore-wl2-@VMAJ@ dist_installed_ecorewl2mainheaders_DATA = lib/ecore_wl2/Ecore_Wl2.h lib_ecore_wl2_libecore_wl2_la_SOURCES = \ +lib/ecore_wl2/ecore_wl2_seat.c \ +lib/ecore_wl2/ecore_wl2_subsurf.c \ +lib/ecore_wl2/ecore_wl2_dnd.c \ +lib/ecore_wl2/ecore_wl2_window.c \ +lib/ecore_wl2/ecore_wl2_input.c \ +lib/ecore_wl2/ecore_wl2_output.c \ +lib/ecore_wl2/ecore_wl2_display.c \ +lib/ecore_wl2/ecore_wl2.c \ +lib/ecore_wl2/ecore_wl2_private.h + +nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \ lib/ecore_wl2/teamwork-protocol.c \ lib/ecore_wl2/teamwork-client-protocol.h \ lib/ecore_wl2/session-recovery-client-protocol.h \ @@ -19,16 +30,7 @@ lib/ecore_wl2/www-protocol.c \ lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \ lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \ lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \ -lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \ -lib/ecore_wl2/ecore_wl2_seat.c \ -lib/ecore_wl2/ecore_wl2_subsurf.c \ -lib/ecore_wl2/ecore_wl2_dnd.c \ -lib/ecore_wl2/ecore_wl2_window.c \ -lib/ecore_wl2/ecore_wl2_input.c \ -lib/ecore_wl2/ecore_wl2_output.c \ -lib/ecore_wl2/ecore_wl2_display.c \ -lib/ecore_wl2/ecore_wl2.c \ -lib/ecore_wl2/ecore_wl2_private.h +lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c lib_ecore_wl2_libecore_wl2_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WL2_CFLAGS@ lib_ecore_wl2_libecore_wl2_la_LIBADD = @ECORE_WL2_LIBS@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 2f58d5f..b2f4885 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -1235,7 +1235,6 @@ modules/evas/engines/wayland_shm/evas_engine.c \ modules/evas/engines/wayland_shm/evas_engine.h \ modules/evas/engines/wayland_shm/evas_shm.c \ modules/evas/engines/wayland_shm/evas_dmabuf.c \ -lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \ modules/evas/engines/wayland_shm/evas_outbuf.c \ static_libs/libdrm/drm_fourcc.h \ static_libs/libdrm/drm.h \ @@ -1245,7 +1244,12 @@ static_libs/libdrm/exynos_drmif.h \ static_libs/libdrm/i915_drm.h \ static_libs/libdrm/intel_bufmgr.h \ static_libs/libdrm/LICENSE + +NODIST_WAYLAND_SHM_SOURCES = \ +lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c + if EVAS_STATIC_BUILD_WAYLAND_SHM +nodist_lib_evas_libevas_la_SOURCES = $(NODIST_WAYLAND_SHM_SOURCES) lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ \ -I$(top_srcdir)/src/static_libs/libdrm @@ -1259,6 +1263,7 @@ enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la install_enginewaylandshmpkgLTLIBRARIES = install-enginewaylandshmpkgLTLIBRARIES $(install_enginewaylandshmpkgLTLIBRARIES): install-libLTLIBRARIES +nodist_modules_evas_engines_wayland_shm_module_la_SOURCES = $(NODIST_WAYLAND_SHM_SOURCES) modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) modules_evas_engines_wayland_shm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ -- 2.7.4