implement arb_vertex_program in hw for r200. Code contains still some hacks, generic...

[mesa.git] / src / mesa / drivers / dri / Makefile.template

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 35f7fd8a12994254dcd0bbbbb55a1833ff39fc7e..4a7a6552ac0ffcc4bee0a285307d2ce7fe0643a1 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -14,8 +14,7 @@ COMMON_SOURCES = \
 ifeq ($(WINDOW_SYSTEM),dri)
 WINOBJ=
 WINLIB=
-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \
-           `pkg-config --cflags libdrm`
+INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
          $(ASM_SOURCES:.S=.o) 
@@ -25,8 +24,6 @@ WINOBJ=
 WINLIB=-L$(MESA)/src/glx/mini
 MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
 INCLUDES = $(MINIGLX_INCLUDES) \
-          -I$(DRM_SOURCE_PATH)/shared-core \
-          -I$(DRM_SOURCE_PATH)/libdrm \
           $(SHARED_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
@@ -40,7 +37,6 @@ SHARED_INCLUDES = \
        -I. \
        -I$(TOP)/src/mesa/drivers/dri/common \
        -Iserver \
-       -I$(DRM_SOURCE_PATH)/shared-core \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
        -I$(TOP)/src/mesa \
@@ -52,15 +48,16 @@ SHARED_INCLUDES = \
        -I$(TOP)/src/mesa/swrast \
        -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/egl/main \
-       -I$(TOP)/src/egl/drivers/dri
+       -I$(TOP)/src/egl/drivers/dri \
+       `pkg-config --cflags libdrm`
 
 ##### RULES #####
 
 .c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
 
 .S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES)  $< -o $@
 
 
 ##### TARGETS #####
@@ -85,11 +82,10 @@ $(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 
 # Run 'make depend' to update the dependencies if you change
 # what's included by any source file.
-.PHONY: depend
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-               > /dev/null 
+       $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
+               $(ASM_SOURCES) > /dev/null
 
 
 # Emacs tags