X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=847b5b256dff12d5625da8daa706d5b2176a11bc;hb=3bd6e3d532d5c4e0d1c7ef17b13d9784589771c4;hp=e5d5aca8fd50ccc7812123597aeb96d7b2d762a8;hpb=2fb5d15ce38d8d298c4fbf8c0bb336154a314b13;p=mesa.git

diff --git a/Makefile b/Makefile
index e5d5aca8fd5..847b5b256df 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ default: $(TOP)/configs/current
 	done
 
 
+doxygen:
+	(cd doxygen ; make) ; \
+
 clean:
 	@for dir in $(SUBDIRS) ; do \
 		(cd $$dir ; $(MAKE) clean) ; \
@@ -22,11 +25,19 @@ realclean:
 	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
+	-rm -f `find . -name \*.o`
+	-rm -f `find . -name \*.a`
+	-rm -f `find . -name \*.so`
+
 
 
 install:
 	@echo "Installing"
-	$(TOP)/bin/installmesa 
+	$(TOP)/bin/installmesa
+
+# DirectFBGL module installation
+linux-directfb-install:
+	cd src/mesa/drivers/directfb && $(MAKE) install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -42,15 +53,22 @@ $(TOP)/configs/current:
 
 # Rules to set/install a specific build configuration
 aix \
+aix-64 \
 aix-gcc \
+aix-static \
+beos \
 darwin \
 darwin-static \
 freebsd \
+freebsd-dri \
+freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
+hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
+hpux11-64 \
 hpux11-64-static \
 hpux9 \
 hpux9-gcc \
@@ -64,9 +82,11 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-directfb \
 linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
+linux-dri-ppc \
 linux-glide \
 linux-icc \
 linux-icc-static \
@@ -76,6 +96,7 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
@@ -106,9 +127,9 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.1
-LIB_NAME = MesaLib-6.1
-DEMO_NAME = MesaDemos-6.1
+DIRECTORY = Mesa-6.3
+LIB_NAME = MesaLib-6.3
+DEMO_NAME = MesaDemos-6.3
 
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
@@ -116,6 +137,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/mms-config.					\
 	$(DIRECTORY)/Mesa.dsw						\
 	$(DIRECTORY)/bin/mklib						\
+	$(DIRECTORY)/bin/installmesa					\
 	$(DIRECTORY)/configs/[a-z]*					\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
@@ -165,22 +187,27 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/math.dsp				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
+	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
+	$(DIRECTORY)/src/mesa/shader/shader.dsp				\
+	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/swrast.dsp				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
 	$(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp		\
 	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
-	$(DIRECTORY)/src/mesa/tnl/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
 	$(DIRECTORY)/src/mesa/tnl/tnl.dsp				\
 	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
-	$(DIRECTORY)/src/mesa/drivers/beos/*.h				\
+	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]		\
+	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile		\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
@@ -240,6 +267,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/glw/*.[ch]					\
 	$(DIRECTORY)/src/glw/Makefile*					\
 	$(DIRECTORY)/src/glw/README					\
+	$(DIRECTORY)/src/glw/depend					\
 	$(DIRECTORY)/progs/Makefile					\
 	$(DIRECTORY)/progs/util/README					\
 	$(DIRECTORY)/progs/util/*.[ch]					\
@@ -249,7 +277,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/vms/xlib_share.opt
 
 
-DEMO_FILES =	\
+GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
@@ -259,13 +287,19 @@ DEMO_FILES =	\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
 	$(DIRECTORY)/src/glut/glx/glut.dsp		\
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
-	$(DIRECTORY)/src/glut/beos/*.h			\
+	$(DIRECTORY)/src/glut/beos/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.cpp		\
-	$(DIRECTORY)/src/glut/beos/libglut.def		\
-	$(DIRECTORY)/src/glut/beos/Makefile*		\
+	$(DIRECTORY)/src/glut/beos/Makefile		\
 	$(DIRECTORY)/src/glut/dos/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
+	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
+	$(DIRECTORY)/src/glut/ggi/Makefile
+
+
+DEMO_FILES = \
+	$(DIRECTORY)/progs/beos/*.cpp			\
+	$(DIRECTORY)/progs/beos/Makefile		\
 	$(DIRECTORY)/progs/images/*.rgb			\
 	$(DIRECTORY)/progs/images/*.rgba		\
 	$(DIRECTORY)/progs/demos/Makefile*		\
@@ -291,6 +325,26 @@ DEMO_FILES =	\
 	$(DIRECTORY)/progs/ggi/*.c
 
 
+DRI_FILES = \
+	$(DIRECTORY)/src/glx/Makefile					\
+	$(DIRECTORY)/src/glx/mini/*.[ch]				\
+	$(DIRECTORY)/src/glx/mini/example.miniglx.conf			\
+	$(DIRECTORY)/src/glx/mini/NOTES					\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
+	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h	\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/depend			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
+
+
+# Everything for new a Mesa release:
+tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
+
+
 lib_gz:
 	rm -f configs/current ; \
 	cd .. ; \
@@ -300,7 +354,7 @@ lib_gz:
 
 demo_gz:
 	cd .. ; \
-	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
@@ -313,7 +367,7 @@ lib_bz2:
 
 demo_bz2:
 	cd .. ; \
-	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
 	bzip2 $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 
@@ -327,7 +381,7 @@ lib_zip:
 demo_zip:
 	-rm $(DEMO_NAME).zip ; \
 	cd .. ; \
-	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
+	zip -r $(DEMO_NAME).zip $(DEMO_FILES) $(GLUT_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)
 
 md5:
@@ -337,6 +391,3 @@ md5:
 	@-md5sum $(DEMO_NAME).tar.gz
 	@-md5sum $(DEMO_NAME).tar.bz2
 	@-md5sum $(DEMO_NAME).zip
-
-# Everything for new a Mesa release:
-tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5