diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default | 1 | ||||
| -rw-r--r-- | configs/freebsd-dri | 4 | ||||
| -rw-r--r-- | configs/linux-dri | 16 | ||||
| -rw-r--r-- | configs/linux-dri-xcb | 10 | ||||
| -rw-r--r-- | configs/linux-egl | 4 | ||||
| -rw-r--r-- | configs/linux-llvm | 2 |
6 files changed, 19 insertions, 18 deletions
diff --git a/configs/default b/configs/default index 43666110b39..2b1bf9bef3d 100644 --- a/configs/default +++ b/configs/default @@ -40,6 +40,7 @@ MKDEP_OPTIONS = -fdepend MAKE = make FLEX = flex BISON = bison +PKG_CONFIG = pkg-config # Use MINSTALL for installing libraries, INSTALL for everything else MINSTALL = $(SHELL) $(TOP)/bin/minstall diff --git a/configs/freebsd-dri b/configs/freebsd-dri index c4169b81d4e..9e810c4b8f8 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -32,8 +32,8 @@ MESA_ASM_SOURCES = # Library/program dependencies MESA_MODULES = $(TOP)/src/mesa/libmesa.a -LIBDRM_CFLAGS = `pkg-config --cflags libdrm` -LIBDRM_LIB = `pkg-config --libs libdrm` +LIBDRM_CFLAGS = `$(PKG_CONFIG) --cflags libdrm` +LIBDRM_LIB = `$(PKG_CONFIG) --libs libdrm` DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -pthread $(LIBDRM_LIB) diff --git a/configs/linux-dri b/configs/linux-dri index 26c73ccf019..a3e9baba2f2 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -44,8 +44,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib MESA_MODULES = $(TOP)/src/mesa/libmesa.a -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) +LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) +LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -lpthread -ldl $(LIBDRM_LIB) @@ -64,13 +64,13 @@ GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i915 i965 nouveau r200 r300 r600 radeon swrast -INTEL_LIBS = $(shell pkg-config --libs libdrm_intel) -INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel) +INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel) +INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel) -NOUVEAU_LIBS = $(shell pkg-config --libs libdrm_nouveau) -NOUVEAU_CFLAGS = $(shell pkg-config --cflags libdrm_nouveau) +NOUVEAU_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_nouveau) +NOUVEAU_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_nouveau) -LIBDRM_RADEON_LIBS = $(shell pkg-config --libs libdrm_radeon) -LIBDRM_RADEON_CFLAGS = $(shell pkg-config --cflags libdrm_radeon) +LIBDRM_RADEON_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_radeon) +LIBDRM_RADEON_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_radeon) RADEON_CFLAGS = "-DHAVE_LIBDRM_RADEON=1 $(LIBDRM_RADEON_CFLAGS)" RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS) diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index a845f71d231..6968bebe450 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -25,7 +25,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN -X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx) +X11_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I x11) $(shell $(PKG_CONFIG) --cflags-only-I xcb) $(shell $(PKG_CONFIG) --cflags-only-I x11-xcb) $(shell $(PKG_CONFIG) --cflags-only-I xcb-glx) CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \ $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math @@ -39,15 +39,15 @@ CXXFLAGS += -fno-strict-aliasing MESA_ASM_SOURCES = # Library/program dependencies -EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11) +EXTRA_LIB_PATH=$(shell $(PKG_CONFIG) --libs-only-L x11) MESA_MODULES = $(TOP)/src/mesa/libmesa.a -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) +LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) +LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ - $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) + $(LIBDRM_LIB) $(shell $(PKG_CONFIG) --libs xcb) $(shell $(PKG_CONFIG) --libs x11-xcb) $(shell $(PKG_CONFIG) --libs xcb-glx) SRC_DIRS = glx gallium mesa glu diff --git a/configs/linux-egl b/configs/linux-egl index 216bcbab321..2c8bfdd6f59 100644 --- a/configs/linux-egl +++ b/configs/linux-egl @@ -40,8 +40,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib MESA_MODULES = $(TOP)/src/mesa/libmesa.a -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) -LIBDRM_LIB = $(shell pkg-config --libs libdrm) +LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) +LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm) DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -lpthread -ldl \ diff --git a/configs/linux-llvm b/configs/linux-llvm index ef6c7bb105a..259d8ac7a2e 100644 --- a/configs/linux-llvm +++ b/configs/linux-llvm @@ -44,4 +44,4 @@ LD = g++ GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ # to allow the NV drivers to compile -LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) +LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm) |