X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2FMakefile;h=2403223db21c4b73a805bb019b35dc8e81f9996b;hb=088c6404fcae07dec6dcf16d2cb0777aa7b446ad;hp=42e05ada269c70bec1bc9e906324ca73b1847446;hpb=31848304870b5ddba91b82545a4ed7a097f7ec4c;p=mesa.git

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 42e05ada269..2403223db21 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -11,173 +11,132 @@ GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 
+.SUFFIXES : .cpp
+
 .c.o:
 	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
+.cpp.o:
+	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
+
 .S.o:
 	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
 
-# Figure out what to make here
-default:
-	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-		$(MAKE) linux-solo ; \
-	elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-		$(MAKE) osmesa-only ; \
-	elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
-		$(MAKE) beos ; \
-	else \
-		$(MAKE) stand-alone ; \
-	fi
-
-# BeOS driver target
-beos: depend subdirs mesa.a
-	cd drivers/beos; $(MAKE)
-	
-######################################################################
-# Linux solo DRI drivers
-
-SOLO_C_SOURCES = \
-	$(MAIN_SOURCES)		\
-	$(MATH_SOURCES)		\
-	$(ARRAY_CACHE_SOURCES)	\
-	$(TNL_SOURCES)		\
-	$(SWRAST_SOURCES)	\
-	$(SWRAST_SETUP_SOURCES)	\
-	$(SHADER_SOURCES)       \
-	$(ASM_C_SOURCES)	
+default: depend subdirs libmesa.a
 
-SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
-		$(ASM_SOURCES:.S=.o)
+ifneq ($(DRIVER_DIRS),dri)
+default: libglapi.a
+endif
 
-linux-solo: depend subdirs mesa.a drivers-dri
 
+######################################################################
 # Make archive of core object files
-mesa.a:	$(SOLO_OBJECTS)
-	rm -f $@
-	ar rcv $@ $(SOLO_OBJECTS)
-	ranlib $@
+libmesa.a: $(SOLO_OBJECTS)
+	@ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);
 	@if [ "${CONFIG_NAME}" = "beos" ] ; then \
 		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:
-	cd drivers/dri ; $(MAKE)
+libglapi.a: $(GLAPI_OBJECTS)
+	@ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
 
 
 ######################################################################
 # Stand-alone Mesa libGL and libOSMesa
-
 STAND_ALONE_DRIVER_SOURCES = \
 	$(COMMON_DRIVER_SOURCES) \
-	$(X11_DRIVER_SOURCES) \
-	$(GLIDE_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)
+	$(X11_DRIVER_SOURCES)
 
 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)
 
 
-stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME)
+stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
-osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
-
-subdirs:
-	@ (cd x86 ; $(MAKE))
+osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
-$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-	CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \
-		-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \
-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU)
+	@ $(TOP)/bin/mklib -o $(GL_LIB) \
+		-linker "$(CC)" \
+		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+		-install $(TOP)/$(LIB_DIR) \
+		$(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \
+		$(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
 
 # Make the OSMesa library
-$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
-	if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-		CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) \
+		$(OSMESA16_OBJECTS) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
+		$(TOP)/bin/mklib -o $(OSMESA_LIB) \
+			-linker "$(CC)" \
+			-major $(MESA_MAJOR) \
 			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
-			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
+			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
 	else \
-		CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+		$(TOP)/bin/mklib -o $(OSMESA_LIB) \
+			-linker "$(CC)" \
+			-major $(MESA_MAJOR) \
 			-minor $(MESA_MINOR) -patch $(GL_TINY) \
-			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
+			-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
 			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
 	fi
 
 
-######################################################################
-# 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)	\
-	$(X86_SOURCES)		\
-	$(COMMON_DRIVER_SOURCES)
-
+depend: $(ALL_SOURCES)
+	@ echo "running $(MKDEP)"
+	@ rm -f depend  # workaround oops on gutsy?!?
+	@ touch depend
+	@ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+		> /dev/null 2>/dev/null
 
-SUBDIRS = array_cache drivers/dri glapi main math sparc swrast swrast_setup \
-	tnl tnl_dd
 
+subdirs:
+	@ (cd x86 ; $(MAKE))
+	@ (cd x86-64 ; $(MAKE))
+
+install: default
+	$(INSTALL) -d $(INSTALL_DIR)/include/GL
+	$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
+	$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
+	@if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+		$(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
+	fi
+	@if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
+		$(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \
+	fi
 
-# Update dependencies
-depend: $(ALL_SOURCES)
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-		> /dev/null 2>&1
+## NOT INSTALLED YET:
+## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
+## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
 
 
 # Emacs tags
 tags:
-	etags `find . -name \*.[ch]` `find ../include`
+	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
 clean:
 	-rm -f */*.o
-	rm -f depend mesa.a
-	for dir in $(SUBDIRS) ; do \
-		(cd $$dir ; $(MAKE) clean) ; \
-	done
+	-rm -f */*/*.o
+	-rm -f depend depend.bak libmesa.a libglapi.a
+	-rm -f drivers/*/*.o
+	(cd x86 && $(MAKE) clean)
+	(cd x86-64 && $(MAKE) clean)
+
 
 include depend