diff options
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/mini/Makefile | 2 | ||||
| -rw-r--r-- | src/glx/x11/Makefile | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 4dea619b82..7c2687b014 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -68,7 +68,7 @@ drmtest: xf86drm.o drmtest.o depend: $(C_SOURCES) $(ASM_SOURCES) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ - > /dev/null 2>&1 + > /dev/null # Emacs tags diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 2ef1b966fd..a8fe53a62c 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -55,9 +55,7 @@ X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S OBJECTS = $(C_SOURCES:.c=.o) \ $(ASM_SOURCES:.S=.o) -INCLUDES = -I. $(INCLUDE_DIRS) - -INCLUDE_DIRS = \ +INCLUDES = -I. \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ @@ -69,7 +67,8 @@ INCLUDE_DIRS = \ -I$(TOP)/src/mesa/swrast_setup \ -I$(TOP)/src/mesa/drivers/dri/common \ -I$(DRM_SOURCE_PATH)/libdrm \ - -I$(DRM_SOURCE_PATH)/shared + -I$(DRM_SOURCE_PATH)/shared \ + $(X11_INCLUDES) ##### RULES ##### @@ -100,7 +99,7 @@ drmtest: xf86drm.o drmtest.o depend: $(C_SOURCES) $(ASM_SOURCES) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ - > /dev/null 2>&1 + > /dev/null # Emacs tags |