summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-11 19:37:55 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-11 19:37:55 +0000
commit4c4e4bfa4e520a06d5421018247fe9be42124c1c (patch)
treeb67a42b1eb04f5a723285f3c9c18ea42f1a74eea /src/glx
parentac7c147aaf6434ba6c591c0a2b4dc765a571cc2f (diff)
Makefile cleanups suggested by George Fufutos (bugzilla #3899).
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/x11/Makefile18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index ff35f32f8f..7cfd180e78 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -1,15 +1,12 @@
TOP = ../../..
include $(TOP)/configs/current
-# Context creation has evolved over the years, such that this
-# code will not build with DNIO defined. When we finally drop old interface
-# support in libGL, we need to clean up both glxcmds.c and dri_interface.h.
-
DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
C_SOURCES = \
$(TOP)/src/mesa/glapi/glapi.c \
$(TOP)/src/mesa/glapi/glthread.c \
+ $(TOP)/src/mesa/main/dispatch.c \
glcontextmodes.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
$(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
@@ -17,7 +14,6 @@ C_SOURCES = \
$(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \
clientattrib.c \
compsize.c \
- dispatch.c \
eval.c \
glxcmds.c \
glxext.c \
@@ -54,13 +50,8 @@ OBJECTS = $(C_SOURCES:.c=.o) \
INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
- -I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/math \
- -I$(TOP)/src/mesa/transform \
- -I$(TOP)/src/mesa/swrast \
- -I$(TOP)/src/mesa/swrast_setup \
-I$(TOP)/src/mesa/drivers/dri/common \
-I$(DRM_SOURCE_PATH)/libdrm \
-I$(DRM_SOURCE_PATH)/shared-core \
@@ -82,9 +73,6 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
glcontextmodes.c:
ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c .
-dispatch.c:
- ln -s $(TOP)/src/mesa/main/dispatch.c .
-
# Make libGL
$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
$(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
@@ -92,10 +80,6 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
-drmtest: xf86drm.o drmtest.o
- rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
-
-
depend: $(C_SOURCES) $(ASM_SOURCES) Makefile
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES)