X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=1b46a9193ef0dbf6c2705aa68cbf5cb7ea9fcb18;hb=5e5d0ad08167c178fcda005862e3dbead3e8c482;hp=ea00e811b7781c9a5729e05109146c1aa61dfa8e;hpb=ac4e23d78415cfdd601a4e8d733075e946a70be9;p=mesa.git

diff --git a/Makefile b/Makefile
index ea00e811b77..1b46a9193ef 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
+linux-i965 \
 linux-alpha \
 linux-alpha-static \
 linux-cell \
@@ -182,7 +183,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.7-devel
+VERSION=7.7
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -225,6 +226,11 @@ MAIN_FILES = \
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wglext.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
+	$(DIRECTORY)/src/glsl/Makefile					\
+	$(DIRECTORY)/src/glsl/Makefile.template				\
+	$(DIRECTORY)/src/glsl/*/Makefile				\
+	$(DIRECTORY)/src/glsl/*/SConscript				\
+	$(DIRECTORY)/src/glsl/*/*.[ch]					\
 	$(DIRECTORY)/src/Makefile					\
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/sources.mak				\
@@ -240,7 +246,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/shader/*.[chly]				\
 	$(DIRECTORY)/src/mesa/shader/Makefile				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
@@ -415,6 +420,12 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/demos/README			\
 	$(DIRECTORY)/progs/fbdev/Makefile		\
 	$(DIRECTORY)/progs/fbdev/glfbdevtest.c		\
+	$(DIRECTORY)/progs/objviewer/*.[ch]		\
+	$(DIRECTORY)/progs/objviewer/*.obj		\
+	$(DIRECTORY)/progs/objviewer/*.mtl		\
+	$(DIRECTORY)/progs/objviewer/*.rgb		\
+	$(DIRECTORY)/progs/objviewer/Makefile		\
+	$(DIRECTORY)/progs/objviewer/README.txt		\
 	$(DIRECTORY)/progs/osdemos/Makefile		\
 	$(DIRECTORY)/progs/osdemos/*.c			\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
@@ -433,8 +444,7 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
-	$(DIRECTORY)/progs/ggi/*.c			\
-	$(DIRECTORY)/windows/VC7/progs/progs.sln
+	$(DIRECTORY)/progs/ggi/*.c
 
 GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut.h			\
@@ -457,9 +467,7 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/mini/glut.pc.in		\
 	$(DIRECTORY)/src/glut/directfb/Makefile		\
 	$(DIRECTORY)/src/glut/directfb/NOTES		\
-	$(DIRECTORY)/src/glut/directfb/*[ch]		\
-	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
-	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
+	$(DIRECTORY)/src/glut/directfb/*[ch]
 
 DEPEND_FILES = \
 	$(TOP)/src/mesa/depend		\
@@ -499,9 +507,11 @@ rm_depend:
 		touch $$dep ; \
 	done
 
-lib_gz:
-	rm -f configs/current ; \
-	rm -f configs/autoconf ; \
+rm_config:
+	rm -f configs/current
+	rm -f configs/autoconf
+
+lib_gz: rm_config
 	cd .. ; \
 	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
@@ -519,9 +529,7 @@ glut_gz:
 	gzip $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
 
-lib_bz2:
-	rm -f configs/current ; \
-	rm -f configs/autoconf ; \
+lib_bz2: rm_config
 	cd .. ; \
 	tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
 	bzip2 $(LIB_NAME).tar ; \
@@ -539,9 +547,7 @@ glut_bz2:
 	bzip2 $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
 
-lib_zip:
-	rm -f configs/current ; \
-	rm -f configs/autoconf ; \
+lib_zip: rm_config
 	rm -f $(LIB_NAME).zip ; \
 	cd .. ; \
 	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
@@ -570,5 +576,7 @@ md5:
 	@-md5sum $(GLUT_NAME).tar.bz2
 	@-md5sum $(GLUT_NAME).zip
 
-.PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \
-	glut_bz2 lib_zip demo_zip glut_zip md5
+.PHONY: tarballs rm_depend rm_config md5 \
+	lib_gz demo_gz glut_gz \
+	lib_bz2 demo_bz2 glut_bz2 \
+	lib_zip demo_zip glut_zip