summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-09-10 16:41:17 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-09-10 16:41:17 +0000
commit26c7e65785df37c109f39967c3e21f9450565008 (patch)
tree37fe351ed9761035c7036a3bd0a61f996aad0e7f /src
parent5704b8e57a0c618ddf51502e99e9dbd48cc3e685 (diff)
Clean-up of sources/Makefile, bug 4111
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile98
-rw-r--r--src/mesa/sources14
2 files changed, 30 insertions, 82 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 9b0a21239f..8f3856d949 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -37,34 +37,17 @@ default:
$(MAKE) stand-alone ; \
fi
-# BeOS driver target
-beos: depend subdirs libmesa.a
- cd drivers/beos; $(MAKE)
-install: default
- @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
- cd drivers/dri ; $(MAKE) install ; \
- fi
-
######################################################################
-# Linux solo DRI drivers
+# BeOS driver target
-SOLO_C_SOURCES = \
- $(MAIN_SOURCES) \
- $(MATH_SOURCES) \
- $(ARRAY_CACHE_SOURCES) \
- $(TNL_SOURCES) \
- $(SWRAST_SOURCES) \
- $(SWRAST_SETUP_SOURCES) \
- $(SHADER_SOURCES) \
- $(SLANG_SOURCES) \
- $(ASM_C_SOURCES)
+beos: depend subdirs libmesa.a
+ cd drivers/beos; $(MAKE)
-SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
- $(ASM_SOURCES:.S=.o)
-linux-solo: depend subdirs libmesa.a drivers-dri
+######################################################################
+# Linux DRI drivers
# Make archive of core object files
libmesa.a: $(SOLO_OBJECTS)
@@ -74,37 +57,22 @@ libmesa.a: $(SOLO_OBJECTS)
mimeset -f "$@" ; \
fi
-# note: cannot use the name of the directory ("drivers") as the
-# target, otherwise make will look & see that the "drivers" directory
-# already exists, so not try to rebuild it...
-drivers-dri:
+linux-solo: depend subdirs mesa.a
cd drivers/dri ; $(MAKE)
-
#####################################################################
# Stand-alone Mesa libGL, no built-in drivers (DirectFB)
-LIBGL_CORE_SOURCES = \
- $(CORE_SOURCES) \
- $(ASM_SOURCES)
-
-LIBGL_CORE_OBJECTS = \
- $(CORE_OBJECTS) \
- $(ASM_SOURCES:.S=.o)
-
-# Make libGL from core object files
-libgl-core: $(LIBGL_CORE_OBJECTS)
+libgl-core: $(CORE_OBJECTS)
@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
- -install $(LIB_DIR) $(MKLIB_OPTIONS) $(LIBGL_CORE_OBJECTS) $(GL_LIB_DEPS)
+ -install $(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS)
-# DirectFB driver target
directfb: depend subdirs libgl-core
cd drivers/directfb; $(MAKE)
-
######################################################################
# Stand-alone Mesa libGL and libOSMesa
@@ -115,26 +83,16 @@ STAND_ALONE_DRIVER_SOURCES = \
$(SVGA_DRIVER_SOURCES) \
$(FBDEV_DRIVER_SOURCES)
-STAND_ALONE_SOURCES = \
- $(CORE_SOURCES) \
- $(ASM_SOURCES) \
- $(STAND_ALONE_DRIVER_SOURCES)
-
-# ASM_SOURCES is defined in the config file
-ASM_OBJECTS = $(ASM_SOURCES:.S=.o)
-
STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
STAND_ALONE_OBJECTS = \
$(CORE_OBJECTS) \
- $(ASM_OBJECTS) \
$(STAND_ALONE_DRIVER_OBJECTS)
# For libOSMesa16 or libOSMesa32 we link _all_ the objects into the library,
# not just the osmesa.o object (i.e. we don't have a libGL).
OSMESA16_OBJECTS = \
$(CORE_OBJECTS) \
- $(ASM_OBJECTS) \
$(COMMON_DRIVER_OBJECTS) \
$(OSMESA_DRIVER_OBJECTS)
@@ -143,10 +101,6 @@ stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NA
osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
-subdirs:
- @ (cd x86 ; $(MAKE))
- @ (cd x86-64 ; $(MAKE))
-
# Make the GL library
$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
@@ -172,40 +126,17 @@ $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
######################################################################
-# 16 (or 32) bit/channel OSMesa
-
-# $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA16_OBJECTS)
-# $(TOP)/bin/mklib -o $(OSMESA_LIB) \
-# -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-# -install $(LIB_DIR) \
-# $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OSMESA16_OBJECTS)
-
-
-
-######################################################################
# Generic stuff
ALL_SOURCES = \
$(GLAPI_SOURCES) \
- $(MAIN_SOURCES) \
- $(MATH_SOURCES) \
- $(ARRAY_CACHE_SOURCES) \
- $(TNL_SOURCES) \
- $(SHADER_SOURCES) \
- $(SWRAST_SOURCES) \
- $(SWRAST_SETUP_SOURCES) \
- $(ASM_C_SOURCES) \
+ $(SOLO_SOURCES) \
$(X86_SOURCES) \
$(COMMON_DRIVER_SOURCES)\
$(X11_DRIVER_SOURCES) \
$(OSMESA_DRIVER_SOURCES)
-SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
- tnl tnl_dd
-
-
-# Update dependencies
depend: $(ALL_SOURCES)
@ echo "running $(MKDEP)"
@ touch depend
@@ -213,6 +144,17 @@ depend: $(ALL_SOURCES)
> /dev/null
+subdirs:
+ @ (cd x86 ; $(MAKE))
+ @ (cd x86-64 ; $(MAKE))
+
+
+install: default
+ @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
+ cd drivers/dri ; $(MAKE) install ; \
+ fi
+
+
# Emacs tags
tags:
etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
diff --git a/src/mesa/sources b/src/mesa/sources
index 937405474d..627fa5144d 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -289,9 +289,8 @@ FBDEV_DRIVER_SOURCES = \
### All the core C sources
-CORE_SOURCES = \
+SOLO_SOURCES = \
$(MAIN_SOURCES) \
- $(GLAPI_SOURCES) \
$(MATH_SOURCES) \
$(ARRAY_CACHE_SOURCES) \
$(TNL_SOURCES) \
@@ -306,8 +305,15 @@ CORE_SOURCES = \
### Object files
-#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+SOLO_OBJECTS = \
+ $(SOLO_SOURCES:.c=.o) \
+ $(ASM_SOURCES:.S=.o)
+
+GLAPI_OBJECTS = \
+ $(GLAPI_SOURCES:.c=.o) \
+ $(ASM_API_SOURCES:.S=.o)
+
+CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)