summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/nouveau/Makefile
diff options
context:
space:
mode:
authorJohannes Obermayr <[email protected]>2011-06-02 17:15:44 -0600
committerBrian Paul <[email protected]>2011-06-02 17:21:26 -0600
commit873379a8818eed9ab16c24728b7091a3a3705c5b (patch)
tree99b10cddd04027aed935e5fa7d17f165b1b56ba8 /src/mesa/drivers/dri/nouveau/Makefile
parenta9c5efb11104d8cfe3139c5c9b6e4b0a4fcb7de5 (diff)
dri/nouveau: Fix build with --enable-shared-dricore.
- Based on the work of Себастьян Gliţa Κατινα <[email protected]> - Split Makefile.template into Makefile.defines and Makefile.targets - Adapt other drivers to new situation - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35441 Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/Makefile')
-rw-r--r--src/mesa/drivers/dri/nouveau/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/Makefile b/src/mesa/drivers/dri/nouveau/Makefile
index 3b506a91ffa..e485a98761f 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile
+++ b/src/mesa/drivers/dri/nouveau/Makefile
@@ -3,11 +3,10 @@
TOP = ../../../../..
include $(TOP)/configs/current
-CFLAGS += $(shell pkg-config libdrm libdrm_nouveau --cflags)
-DRI_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)
-
LIBNAME = nouveau_vieux_dri.so
+include ../Makefile.defines
+
DRIVER_SOURCES = \
nouveau_screen.c \
nouveau_context.c \
@@ -51,7 +50,9 @@ C_SOURCES = \
ASM_SOURCES =
+INCLUDES += $(NOUVEAU_CFLAGS)
+DRI_LIB_DEPS += $(NOUVEAU_LIBS)
-include ../Makefile.template
+include ../Makefile.targets
symlinks: