Attachment 2893 Details for Bug 4111 – clean up src/mesa/Makefile

[patch] clean up src/mesa/Makefile

patch (text/plain), 5.03 KB, created by George - on 2005-08-16 06:23:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-08-16 06:23:49 UTC

Size: 5.03 KB

patch

obsolete

>diff -Naur a/Makefile b/Makefile
>--- a/Makefile	2005-08-16 14:30:02.507359776 +0300
>+++ b/Makefile	2005-08-16 15:58:14.166905248 +0300
>@@ -37,36 +37,17 @@
> 		$(MAKE) stand-alone ; \
> 	fi
> 
>+
>+######################################################################
> # BeOS driver target
>+
> beos: depend subdirs mesa.a
> 	cd drivers/beos; $(MAKE)
> 
> 
>-install: default
>-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
>-		cd drivers/dri ; $(MAKE) install ; \
>-	fi
>-
> ######################################################################
> # Linux solo DRI drivers
> 
>-SOLO_C_SOURCES = \
>-	$(MAIN_SOURCES)		\
>-	$(MATH_SOURCES)		\
>-	$(ARRAY_CACHE_SOURCES)	\
>-	$(TNL_SOURCES)		\
>-	$(SWRAST_SOURCES)	\
>-	$(SWRAST_SETUP_SOURCES)	\
>-	$(SHADER_SOURCES)       \
>-	$(SLANG_SOURCES)	\
>-	$(ASM_C_SOURCES)	
>-
>-SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
>-		$(ASM_SOURCES:.S=.o)
>-
>-linux-solo: depend subdirs mesa.a drivers-dri
>-
>-# Make archive of core object files
> mesa.a:	$(SOLO_OBJECTS)
> 	rm -f $@
> 	ar rcv $@ $(SOLO_OBJECTS)
>@@ -75,37 +56,22 @@
> 		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
> 
>@@ -116,26 +82,16 @@
> 	$(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)
> 
>@@ -144,10 +100,6 @@
> 
> 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)' \
>@@ -173,40 +125,17 @@
> 
> 
> ######################################################################
>-# 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
>@@ -214,6 +143,17 @@
> 		> /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 -Naur a/sources b/sources
>--- a/sources	2005-08-16 15:08:04.479447288 +0300
>+++ b/sources	2005-08-16 14:38:57.897968032 +0300
>@@ -286,9 +286,8 @@
> 
> ### All the core C sources
> 
>-CORE_SOURCES = \
>+SOLO_SOURCES = \
> 	$(MAIN_SOURCES)		\
>-	$(GLAPI_SOURCES)	\
> 	$(MATH_SOURCES)		\
> 	$(ARRAY_CACHE_SOURCES)	\
> 	$(TNL_SOURCES)		\
>@@ -303,8 +302,16 @@
> 
> ### Object files
> 
>+SOLO_OBJECTS = \
>+	$(SOLO_SOURCES:.c=.o) \
>+	$(ASM_SOURCES:.S=.o)
>+
>+GLAPI_OBJECTS = \
>+	$(GLAPI_SOURCES:.c=.o) \
>+	$(ASM_API_SOURCES:.S=.o)
>+
> #CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
>-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
>+CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
> 
> OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)
>

Actions: View | Splinter Review

Attachments on bug 4111: 2893

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.