X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=beb1bd7c88bd88563109c2d8942521d154735578;hb=ac7091078fab404284bdac5d38f5cd26838f5c76;hp=9832d4c6acfcfc95ddeb20bdf5f97353eb768f9d;hpb=22388c1902b4d00d1def0b416e690c58cadf69da;p=mesa.git

diff --git a/Makefile b/Makefile
index 9832d4c6acf..beb1bd7c88b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,22 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make ; \
-		popd ; \
+		(cd $$dir ; $(MAKE)) || exit 1 ; \
 	done
 
 
+doxygen:
+	(cd doxygen ; make) ; \
+
 clean:
 	@for dir in $(SUBDIRS) ; do \
-		pushd $$dir ; \
-		make clean; \
-		popd ; \
+		(cd $$dir ; $(MAKE) clean) ; \
 	done
 
 
-realclean: clean
-	#-rm -rf $(LIB_DIR)
+realclean:
+	touch $(TOP)/configs/current
+	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 
@@ -45,14 +45,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 \
@@ -66,6 +74,11 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-dri \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-dri-ppc \
+linux-glide \
 linux-icc \
 linux-icc-static \
 linux-osmesa16 \
@@ -74,13 +87,18 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-x86 \
+linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
+linux-tcc \
 linux-x86 \
+linux-x86-debug \
 linux-x86-64 \
 linux-x86-64-static \
+linux-x86-glide \
 linux-x86-static \
 netbsd \
 openbsd \
@@ -94,15 +112,15 @@ sunos5 \
 sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
-	cp $(TOP)/configs/$@ $(TOP)/configs/current
-	make default
+	(cd configs && rm -f current && ln -s $@ current)
+	$(MAKE) default
 
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-6.1
-LIB_NAME = MesaLib-6.1
-DEMO_NAME = MesaDemos-6.1
+DIRECTORY = Mesa-6.2
+LIB_NAME = MesaLib-6.2
+DEMO_NAME = MesaDemos-6.2
 
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
@@ -110,6 +128,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					\
@@ -159,20 +178,23 @@ 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/dos/*.[chS]			\
@@ -234,6 +256,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]					\
@@ -253,13 +276,16 @@ 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		\
+	$(DIRECTORY)/progs/beos/*.cpp			\
+	$(DIRECTORY)/progs/beos/Makefile		\
 	$(DIRECTORY)/progs/images/*.rgb			\
 	$(DIRECTORY)/progs/images/*.rgba		\
 	$(DIRECTORY)/progs/demos/Makefile*		\
@@ -285,6 +311,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 .. ; \
@@ -331,6 +377,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