diff options
| author | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
| commit | 1eb957bb4108123bea95b818e0544e3b5f255e08 (patch) | |
| tree | d7febd8e6cc841ab16dca53f031322ec47d5ccd9 /src/mesa/drivers/dri/nouveau/Makefile | |
| parent | a6c76c8a90dc8995feed3c61b02dbd8408149036 (diff) | |
| parent | 6491e9593d5cbc5644eb02593a2f562447efdcbb (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/Makefile')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile | 9 |
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: |