diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
| commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
| tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /xorg-server/glamor/Makefile.am | |
| parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
| parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
| download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'xorg-server/glamor/Makefile.am')
| -rw-r--r-- | xorg-server/glamor/Makefile.am | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/xorg-server/glamor/Makefile.am b/xorg-server/glamor/Makefile.am index 2fd521f11..3fe25304d 100644 --- a/xorg-server/glamor/Makefile.am +++ b/xorg-server/glamor/Makefile.am @@ -1,18 +1,10 @@ -lib_LTLIBRARIES = libglamor.la +noinst_LTLIBRARIES = libglamor.la libglamor_egl_stubs.la -if GLAMOR_GLES2 -libglamor_la_LIBADD = $(GLESV2_LIBS) -else -libglamor_la_LIBADD = $(GL_LIBS) -endif +libglamor_la_LIBADD = $(GLAMOR_LIBS) -AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) - -libglamor_la_LDFLAGS = -version-info 0:0:0 +AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(GLAMOR_CFLAGS) libglamor_la_SOURCES = \ - compat-api.h \ - compiler.h \ glamor.c \ glamor_copyarea.c \ glamor_copywindow.c \ @@ -48,24 +40,8 @@ libglamor_la_SOURCES = \ glamor_compositerects.c\ glamor_xv.c\ glamor_utils.h\ - glamor.h\ - glapi.h - -sdk_HEADERS = glamor.h - -if EGL -LIBGLAMOREGL = libglamoregl.la -module_LTLIBRARIES = $(LIBGLAMOREGL) -libglamoregl_la_DEPENDENCIES = libglamor.la -libglamoregl_la_LDFLAGS = -avoid-version -module -libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) $(GBM_LIBS) libglamor.la -libglamoregl_la_SOURCES = glamor_eglmodule.c glamor_egl.c -libglamoregl_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(GLX_DEFINES) \ - $(LIBDRM_CFLAGS) \ - $(EGL_CFLAGS) \ - $(GBM_CFLAGS) -endif + glamor.h +libglamor_egl_stubs_la_SOURCES = glamor_egl_stubs.c +sdk_HEADERS = glamor.h |