diff options
| author | Brian Paul <[email protected]> | 2005-09-12 15:19:19 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-09-12 15:19:19 +0000 |
| commit | 28569c25f6c211796fd8720f98f386690bddd3c9 (patch) | |
| tree | e92ddf7a88c49a1bee413e989ca61a73f4f75579 /src | |
| parent | 68d436140d44a9f33cb5817577ecd980c694c889 (diff) | |
use ASM_API variable, bug 4415
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/Makefile | 22 | ||||
| -rw-r--r-- | src/mesa/sources | 8 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 415ec02dd6b..84e244501ae 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -3,10 +3,7 @@ include $(TOP)/configs/current 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 \ +SOURCES = \ glcontextmodes.c \ clientattrib.c \ compsize.c \ @@ -33,15 +30,15 @@ C_SOURCES = \ glx_query.c \ glx_texture_compression.c \ dri_glx.c \ - XF86dri.c \ + XF86dri.c -X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S -X86-64_SOURCES = $(TOP)/src/mesa/x86-64/glapi_x86-64.S +include $(TOP)/src/mesa/sources -# ASM_SOURCES = $(X86_SOURCES) +MESA_ASM_API = $(addprefix $(TOP)/src/mesa/, $(ASM_API)) +MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES)) +MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS)) -OBJECTS = $(C_SOURCES:.c=.o) \ - $(ASM_SOURCES:.S=.o) +OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS) INCLUDES = -I. \ -I$(TOP)/include \ @@ -75,9 +72,10 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) -depend: $(C_SOURCES) $(ASM_SOURCES) Makefile +depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \ + $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) # Emacs tags diff --git a/src/mesa/sources b/src/mesa/sources index 627fa5144d1..0756dd36f7b 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -16,7 +16,6 @@ MAIN_SOURCES = \ main/convolve.c \ main/debug.c \ main/depth.c \ - main/dispatch.c \ main/dlist.c \ main/drawpix.c \ main/enable.c \ @@ -59,6 +58,7 @@ MAIN_SOURCES = \ main/vtxfmt.c GLAPI_SOURCES = \ + main/dispatch.c \ glapi/glapi.c \ glapi/glthread.c @@ -302,6 +302,10 @@ SOLO_SOURCES = \ # $(SLANG_C_SOURCES) +CORE_SOURCES = \ + $(GLAPI_SOURCES) \ + $(SOLO_SOURCES) + ### Object files @@ -311,7 +315,7 @@ SOLO_OBJECTS = \ GLAPI_OBJECTS = \ $(GLAPI_SOURCES:.c=.o) \ - $(ASM_API_SOURCES:.S=.o) + $(ASM_API:.S=.o) CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS) |