From 5a0dd3cbc8c3ab450862326fd6d68adea29edf4b Mon Sep 17 00:00:00 2001 From: Hoyub Lee Date: Fri, 30 Jun 2017 17:09:46 +0900 Subject: [PATCH] Change version macro name of libwayland-egl for consistency Change-Id: I148dfa2c459bc6e44c7e65424471f9e8baa139e0 Signed-off-by: Hoyub Lee --- packaging/libtpl-egl.spec | 4 ++-- src/wayland-egl/Makefile | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/libtpl-egl.spec b/packaging/libtpl-egl.spec index 2568c1d..8cb28a8 100644 --- a/packaging/libtpl-egl.spec +++ b/packaging/libtpl-egl.spec @@ -190,7 +190,7 @@ make all #libwayland-egl build %if "%{TPL_WINSYS}" == "WL" cd src/wayland-egl -export WLD_EGL_SO_VER=%{WL_EGL_VER_FULL} +export WL_EGL_SO_VER=%{WL_EGL_VER_FULL} make cd ../../ %endif @@ -238,7 +238,7 @@ cd src/wayland-egl cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VER_MAJOR} cp libwayland-egl.so.%{WL_EGL_VER_FULL} %{buildroot}%{_libdir}/libwayland-egl.so.%{WL_EGL_VERSION} -export WLD_EGL_SO_VER=%{WL_EGL_VER_FULL} +export WL_EGL_SO_VER=%{WL_EGL_VER_FULL} %makeinstall cd - diff --git a/src/wayland-egl/Makefile b/src/wayland-egl/Makefile index 6dda73e..a1c3654 100644 --- a/src/wayland-egl/Makefile +++ b/src/wayland-egl/Makefile @@ -1,4 +1,4 @@ -WLD_EGL_SO_VER ?= no_ver +WL_EGL_SO_VER ?= no_ver SRC_DIR = ./ #CROSS_COMPILE ?= arm-none-linux-gnueabi- @@ -15,19 +15,19 @@ WAYLAND_EGL_SRCS += \ WAYLAND_EGL_OBJS := $(WAYLAND_EGL_SRCS:.c=.o) -libwayland-egl.so.$(WLD_EGL_SO_VER): $(WAYLAND_EGL_OBJS) +libwayland-egl.so.$(WL_EGL_SO_VER): $(WAYLAND_EGL_OBJS) $(TARGET_CC) -shared -o $@ $(WAYLAND_EGL_OBJS) $(CFLAGS) .DEFAULT_GOAL = all -all: libwayland-egl.so.$(WLD_EGL_SO_VER) +all: libwayland-egl.so.$(WL_EGL_SO_VER) clean: - -rm -f $(WAYLAND_EGL_OBJS) libwayland-egl.so.$(WLD_EGL_SO_VER) + -rm -f $(WAYLAND_EGL_OBJS) libwayland-egl.so.$(WL_EGL_SO_VER) install: all cp ../../pkgconfig/wayland-egl.pc $(libdir)/pkgconfig/ - cp libwayland-egl.so.$(WLD_EGL_SO_VER) $(libdir)/ + cp libwayland-egl.so.$(WL_EGL_SO_VER) $(libdir)/ uninstall: -rm -f $(libdir)/pkgconfig/wayland-egl.pc - -rm -f $(libdir)/libwayland-egl.so.$(WLD_EGL_SO_VER) + -rm -f $(libdir)/libwayland-egl.so.$(WL_EGL_SO_VER) -- 2.7.4