picnoir/libglvnd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use the pkg-config variables for X11 and Xext.

Browse source 
In the makefiles, use the CFLAGS and LIBS variables set by the
PKG_CHECK_MODULES macros for X11 and Xext.
This commit is contained in:
Kyle Brenneman 2019-09-12 10:15:33 -06:00
parent a5a74957d8
commit e49caa311f
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/EGL/Makefile.am
View file

@ -49,6 +49,9 @@ libEGL_la_CFLAGS = -I$(srcdir)/$(UTHASH_DIR)
libEGL_la_CFLAGS += -I$(srcdir)/$(UTIL_DIR)
libEGL_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
libEGL_la_CFLAGS += -I$(top_srcdir)/include
if ENABLE_X11
libEGL_la_CFLAGS += $(X11_CFLAGS)
endif
libEGL_la_CFLAGS += \
-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"@sysconfdir@/glvnd/egl_vendor.d:@datadir@/glvnd/egl_vendor.d\"

2
src/GLX/Makefile.am
View file

@ -45,7 +45,7 @@ libGLX_la_CFLAGS = -I$(srcdir)/$(UTHASH_DIR)
libGLX_la_CFLAGS += -I$(srcdir)/$(UTIL_DIR)
libGLX_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
libGLX_la_CFLAGS += -I$(top_srcdir)/include
libGLX_la_CFLAGS += $(GLPROTO_CFLAGS)
libGLX_la_CFLAGS += $(GLPROTO_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS)
# Required library flags
libGLX_la_CFLAGS += $(PTHREAD_CFLAGS)

21
tests/Makefile.am
View file

@ -98,7 +98,8 @@ if ENABLE_GLX
TESTS += $(TESTS_GLX)
check_PROGRAMS += testglxcreatecontext
testglxcreatecontext_LDADD = -lX11
testglxcreatecontext_CFLAGS = $(X11_CFLAGS)
testglxcreatecontext_LDADD = $(X11_LIBS)
testglxcreatecontext_LDADD += $(top_builddir)/src/GLX/libGLX.la
testglxcreatecontext_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la
testglxcreatecontext_SOURCES = \
@ -112,7 +113,8 @@ TESTGLXMAKECURRENT_SOURCES_COMMON = \
check_PROGRAMS += testglxmakecurrent
testglxmakecurrent_SOURCES = $(TESTGLXMAKECURRENT_SOURCES_COMMON)
testglxmakecurrent_LDADD = -lX11 @LIB_DL@
testglxmakecurrent_CFLAGS = $(X11_CFLAGS)
testglxmakecurrent_LDADD = $(X11_LIBS) @LIB_DL@
testglxmakecurrent_LDADD += $(top_builddir)/src/GLX/libGLX.la
testglxmakecurrent_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la
testglxmakecurrent_LDADD += $(top_builddir)/src/util/libglvnd_pthread.la
@ -122,7 +124,8 @@ testglxmakecurrent_LDADD += $(top_builddir)/src/util/libutils_misc.la
check_PROGRAMS += testglxmakecurrent_oldlink
testglxmakecurrent_oldlink_SOURCES = $(TESTGLXMAKECURRENT_SOURCES_COMMON)
testglxmakecurrent_oldlink_LDADD = -lX11 @LIB_DL@
testglxmakecurrent_oldlink_CFLAGS = $(X11_CFLAGS)
testglxmakecurrent_oldlink_LDADD = $(X11_LIBS) @LIB_DL@
testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/GL/libGL.la
testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/libglvnd_pthread.la
testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/libtrace.la
@ -130,12 +133,14 @@ testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/libutils_misc.la
check_PROGRAMS += testglxgetprocaddress
testglxgetprocaddress_LDADD = -lX11
testglxgetprocaddress_CFLAGS = $(X11_CFLAGS)
testglxgetprocaddress_LDADD = $(X11_LIBS)
testglxgetprocaddress_LDADD += $(top_builddir)/src/GLX/libGLX.la
check_PROGRAMS += testglxgetclientstr
testglxgetclientstr_LDADD = -lX11
testglxgetclientstr_CFLAGS = $(X11_CFLAGS)
testglxgetclientstr_LDADD = $(X11_LIBS)
testglxgetclientstr_LDADD += $(top_builddir)/src/GLX/libGLX.la
testglxgetclientstr_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la
testglxgetclientstr_LDADD += $(top_builddir)/src/util/libtrace.la
@ -143,7 +148,8 @@ testglxgetclientstr_LDADD += $(top_builddir)/src/util/libutils_misc.la
check_PROGRAMS += testglxqueryversion
testglxqueryversion_LDADD = -lX11
testglxqueryversion_CFLAGS = $(X11_CFLAGS)
testglxqueryversion_LDADD = $(X11_LIBS)
testglxqueryversion_LDADD += $(top_builddir)/src/GLX/libGLX.la
testglxqueryversion_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la
@ -153,7 +159,8 @@ testpatchentrypoints_SOURCES = \
testpatchentrypoints.c \
test_utils.c
testpatchentrypoints_LDADD = -lX11 @LIB_DL@
testpatchentrypoints_CFLAGS = $(X11_CFLAGS)
testpatchentrypoints_LDADD = $(X11_LIBS) @LIB_DL@
testpatchentrypoints_LDADD += $(top_builddir)/src/GLX/libGLX.la
testpatchentrypoints_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la
testpatchentrypoints_LDADD += $(top_builddir)/src/util/libtrace.la