From ae499376dc83206b9849795bed853ae61c734495 Mon Sep 17 00:00:00 2001 From: Armin K Date: Tue, 12 Mar 2013 20:37:19 +0100 Subject: [PATCH] Autotools Fixes: Properly dist all necesary headers. Shut up automake by changing INCLUDES to AM_CPPFLAGS Fix libglamoregl.so linking with libglamor.so - use rpath --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 55721f6..b7cc31b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ endif instdir = $(moduledir) -INCLUDES = \ +AM_CPPFLAGS = \ $(XORG_INCS) AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS) @@ -31,6 +31,7 @@ libglamor_la_SOURCES = \ glamor_fill.c \ glamor_fillspans.c \ glamor_getspans.c \ + glamor_glext.h \ glamor_glyphs.c \ glamor_polyfillrect.c \ glamor_polylines.c \ @@ -64,7 +65,7 @@ if EGL LIBGLAMOREGL = libglamoregl.la module_LTLIBRARIES = $(LIBGLAMOREGL) libglamoregl_la_DEPENDENCIES = libglamor.la -libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor $(GLX_SYS_LIBS) +libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor $(GLX_SYS_LIBS) -Wl,-rpath -Wl,$(moduledir) libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS) endif -- 1.8.1.5