diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-25 09:22:25 +0200 |
| commit | 5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0 (patch) | |
| tree | c532fb2a693321cc9960fd554654e60351d63249 /mesalib/src/mesa/drivers/dri/common/Makefile.am | |
| parent | 42cd4a1fab6d183e218bd8c6bd65f65211af4d7c (diff) | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.gz vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.tar.bz2 vcxsrv-5b4c4c77b012ceac7b0f4d3ef2f33d91f01084d0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 25 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common/Makefile.am')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am index ce4119d0f..9f49ff3ae 100644 --- a/mesalib/src/mesa/drivers/dri/common/Makefile.am +++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am @@ -27,11 +27,11 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ $(DEFINES) \ - $(LIBDRM_CFLAGS) \ $(VISIBILITY_CFLAGS) noinst_LTLIBRARIES = \ libdricommon.la \ + libmegadriver_stub.la \ libdri_test_stubs.la libdricommon_la_SOURCES = \ @@ -43,4 +43,13 @@ libdri_test_stubs_la_SOURCES = \ dri_test.c libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN +libmegadriver_stub_la_SOURCES = megadriver_stub.c + sysconf_DATA = drirc + +if DRICOMMON_NEED_LIBDRM +AM_CFLAGS += $(LIBDRM_CFLAGS) +libdricommon_la_LDFLAGS = $(LIBDRM_LIBS) +else +AM_CFLAGS += -D__NOT_HAVE_DRM_H +endif |