diff options
| author | Johannes Obermayr <[email protected]> | 2011-06-02 17:15:44 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-06-02 17:21:26 -0600 |
| commit | 873379a8818eed9ab16c24728b7091a3a3705c5b (patch) | |
| tree | 99b10cddd04027aed935e5fa7d17f165b1b56ba8 /src/mesa/drivers/dri/r200 | |
| parent | a9c5efb11104d8cfe3139c5c9b6e4b0a4fcb7de5 (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/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile index 8013768e9fb..4547f7e2ee0 100644 --- a/src/mesa/drivers/dri/r200/Makefile +++ b/src/mesa/drivers/dri/r200/Makefile @@ -3,10 +3,10 @@ TOP = ../../../../.. include $(TOP)/configs/current -CFLAGS += $(RADEON_CFLAGS) - LIBNAME = r200_dri.so +include ../Makefile.defines + ifeq ($(RADEON_LDFLAGS),) CS_SOURCES = radeon_cs_space_drm.c radeon_bo.c radeon_cs.c endif @@ -55,12 +55,13 @@ X86_SOURCES = DRIVER_DEFINES = -DRADEON_R200 +INCLUDES += $(RADEON_CFLAGS) DRI_LIB_DEPS += $(RADEON_LDFLAGS) ##### TARGETS ##### -include ../Makefile.template +include ../Makefile.targets #INCLUDES += -I../radeon/server |