diff options
| author | Armin K <krejzi@email.com> | 2013-03-13 18:49:32 +0100 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-03-18 16:34:38 +0800 |
| commit | f2d7f1cf351bdc3a8a00fe564cd6a937db3b4e19 (patch) | |
| tree | 56dd9bdcf2dfc12d3f67f38992f6665d2b2c1469 | |
| parent | c7241f097ddb4d3bfb832f6b4ee6fafe8b4d2cfe (diff) | |
First attempt to make libglamor.so shared versioned library
As recommended by Michel in this thread reply:
http://lists.freedesktop.org/archives/glamor/2013-March/000305.html
v2: Correct shared library location in glamor.pc.in
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62259
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | glamor.pc.in | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/glamor.pc.in b/glamor.pc.in index 74ecd2e..5257468 100644 --- a/glamor.pc.in +++ b/glamor.pc.in @@ -2,12 +2,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -moduledir=@moduledir@ sdkdir=@sdkdir@ GLAMOR_GL_CFLAGS=@GLAMOR_GL_CFLAGS@ Name: glamor Description: X.Org glamor common library. Version: @PACKAGE_VERSION@ -Cflags: -I${sdkdir} -L${moduledir} -lglamor ${GLAMOR_GL_CFLAGS} - +Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS} +Libs: -L${libdir} -lglamor diff --git a/src/Makefile.am b/src/Makefile.am index 0879287..4beb559 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -inst_LTLIBRARIES = libglamor.la +lib_LTLIBRARIES = libglamor.la # Override these since glamor doesn't need them and the needed files aren't # built (in hw/xfree86/os-support/solaris) until after glamor is built @@ -10,14 +10,12 @@ else libglamor_la_LIBADD = $(GL_LIBS) endif -instdir = $(moduledir) - AM_CPPFLAGS = \ $(XORG_INCS) AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS) -libglamor_la_LDFLAGS = -avoid-version +libglamor_la_LDFLAGS = -version-info 0:0:0 libglamor_la_SOURCES = \ compat-api.h \ @@ -65,7 +63,8 @@ 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 +libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la 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 |