Squashed commit of the following:

commit 1856230d9fa61710cce3e152b8d88b1269611a73
Author: José Fonseca <[email protected]>
Date:   Tue Jul 12 23:41:27 2011 +0100

    make: Use better var names on packaging.

commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c
Author: José Fonseca <[email protected]>
Date:   Tue Jul 12 23:38:21 2011 +0100

    make: Apply several of Dan Nicholson's suggestions.

commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 14:18:20 2011 +0100

    make: Put back the tar.bz2 creation rule.

    Removed by accident.

commit 34983337f9d7db984e9f0117808274106d262110
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 11:59:29 2011 +0100

    make: Determine tarballs contents via git ls-files.

    The wildcards were a mess:
    - lots of files for non Linux platforms missing
    - several files listed and archived twice

    Using git-ls-files ensures things are not loss when making the tarballs.

commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 11:07:14 2011 +0100

    glut: Remove GLUT source.

    Most distros ship freeglut, and most people don't care one vs the other,
    and it hasn't been really maintained.

    So it is better to have Mesa GLUT be revisioned and built separately
    from Mesa.

commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 10:31:02 2011 +0100

    Ignore the tarballs.

commit 26edecac589819f0d0efe2165ab748dbc4e53394
Author: José Fonseca <[email protected]>
Date:   Sat Jul 9 10:30:24 2011 +0100

    make: Create the Mesa-xxx-devel symlink automatically.

    Also actually remote the intermediate uncompressed tarballs.

1 files changed, 0 insertions, 189 deletions

diff --git a/src/glut/glx/Makefile.sgi b/src/glut/glx/Makefile.sgi
deleted file mode 100644
index 9514c324d24..00000000000
--- a/src/glut/glx/Makefile.sgi
+++ /dev/null
@@ -1,189 +0,0 @@
-#! smake
-#
-# Copyright (c) Mark J. Kilgard, 1995, 1998.
-#
-include $(ROOT)/usr/include/make/commondefs
-
-# NOTE:  In my GLUT development tree, many of the C source files for
-# GLUT are generated.  For this reason, "make full_clobber" will remove
-# these generated C files, while "make clobber" will not.
-
-TOP = ../..
-
-TARGETS = libglut.a
-
-LN = ln -s
-MV = mv
-RM = -rm -rf
-
-HDRS = glutint.h glutstroke.h layerutil.h glutbitmap.h
-
-SRCS = \
-	glut_bitmap.c \
-	glut_bwidth.c \
-	glut_cindex.c \
-	glut_cmap.c \
-	glut_cursor.c \
-	glut_dials.c \
-	glut_dstr.c \
-	glut_event.c \
-	glut_ext.c \
-	glut_fbc.c \
-	glut_fullscrn.c \
-	glut_gamemode.c \
-	glut_get.c \
-	glut_glxext.c \
-	glut_init.c \
-	glut_input.c \
-	glut_joy.c \
-	glut_key.c \
-	glut_keyctrl.c \
-	glut_keyup.c \
-	glut_menu.c \
-	glut_menu2.c \
-	glut_mesa.c \
-	glut_modifier.c \
-	glut_overlay.c \
-	glut_shapes.c \
-	glut_space.c \
-	glut_stroke.c \
-	glut_swap.c \
-	glut_swidth.c \
-	glut_tablet.c \
-	glut_teapot.c \
-	glut_util.c \
-	glut_vidresize.c \
-	glut_warp.c \
-	glut_win.c \
-	glut_winmisc.c \
-	layerutil.c
-
-SRCSSEMIGENS = \
-	glut_8x13.c \
-	glut_9x15.c \
-	glut_hel10.c \
-	glut_hel12.c \
-	glut_hel18.c \
-	glut_mroman.c \
-	glut_roman.c \
-	glut_tr10.c \
-	glut_tr24.c
-
-OBJS = $(SRCS:.c=.o) $(SRCSSEMIGENS:.c=.o)
-OTHERGENS = y.tab.c y.tab.h strokegen.c strokegen.h strokelex.c
-OTHERSRCS = strokegen.y strokelex.l stroke.h
-FONTS = Roman.stroke MonoRoman.stroke
-
-# Uncomment the LCDEFS line below if you want to build a version of
-# libglut.a that avoids using the SGI "fast atoms" optimization
-# introduced in IRIX 6.3.  This optimization eliminates serveral X server
-# round-trips.  If you are building libglut.a on an IRIX 6.3 or later
-# machine and want a chance (no guarantees) that GLUT executables built
-# against your libglut.a will work on IRIX 6.2 machines, uncomment out
-# the LCDEFS line below.  Otherwise, you'll get a run-time message about
-# "attempted access to unresolvable symbol in XXX: _XSGIFastInternAtom"
-#LCDEFS = -DNO_FAST_ATOMS
-
-LCOPTS = -I$(TOP)/include -fullwarn 
-LWOFF = ,813,852,827,826
-LDIRT = *~ $(OTHERGENS) strokegen *.bak hardcopy glutsrc.ps capturexfont *.pure dstr dstr.c *.gen
-
-default: $(TARGETS)
-
-sinclude ObjectType.mk
-
-$(OBJS) : $(HDRS)
-
-libglut.a : $(OBJS)
-	$(RM) $@
-	$(AR) crl $@ $(OBJS)
-
-.ORDER : strokegen.h strokegen.c
-
-strokegen.h strokegen.c : strokegen.y
-	$(YACC) -d strokegen.y
-	$(MV) y.tab.c strokegen.c
-	$(MV) y.tab.h strokegen.h
-
-# avoid warnings when compiling lex generated code
-strokegen.o : strokegen.c
-	$(CC) $(CFLAGS) -woff 726,825,635,818,819,820,824,831,835,822,821,1167,1498,1116,1136,1174,1196,803 -c -MDupdate Makedepend strokegen.c
-
-strokelex.c : strokelex.l
-	$(LEX) strokelex.l
-	$(MV) lex.yy.c strokelex.c
-
-# avoid warnings when compiling lex generated code
-strokelex.o : strokelex.c
-	$(CC) $(CFLAGS) -woff 831,825,817,835,702,819,635,824,822,1167,1498,1110,1196,1174,803 -c -MDupdate Makedepend strokelex.c
-
-strokegen : strokegen.o strokelex.o
-	$(CC) -o $@ $(LDFLAGS) strokegen.o strokelex.o -ll
-
-capturexfont : capturexfont.o
-	$(CC) -o $@ $(LDFLAGS) capturexfont.o -lX11
-
-# glut_roman.c and glut_mroman.c are now checked in, but here are rules to generate them
-glut_roman.c.gen : Roman.stroke strokegen
-	./strokegen -s glutStrokeRoman < Roman.stroke > $@
-glut_mroman.c.gen : MonoRoman.stroke strokegen
-	./strokegen -s glutStrokeMonoRoman < MonoRoman.stroke > $@
-
-glutsrc.ps : $(SRCS)
-	$(RM) hardcopy
-	mkdir -p hardcopy
-	for i in $(SRCS) ;\
-	do \
-	  grep -v CENTRY $$i | grep -v INDENT- > hardcopy/$$i; \
-	done
-	cd hardcopy ; enscript -p ../$@ -G -2r `echo $(SRCS) | fmt -1 | sort`
-	$(RM) hardcopy
-
-# The bitmap files can be generated using capturexfont, but because
-# they require a connection to an X server and potentially different
-# X servers have different fonts, these generated files are part
-# of the GLUT distribution.
-
-9_BY_15 = -misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1
-8_BY_13 = -misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1
-TR10 = -adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1
-TR24 = -adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1
-HEL10 = -adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1
-HEL12 = -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
-HEL18 = -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
-
-semigens : capturexfont
-	./capturexfont $(9_BY_15) glutBitmap9By15 > glut_9x15.c.gen
-	./capturexfont $(8_BY_13) glutBitmap8By13 > glut_8x13.c.gen
-	./capturexfont $(TR10) glutBitmapTimesRoman10 > glut_tr10.c.gen
-	./capturexfont $(TR24) glutBitmapTimesRoman24 > glut_tr24.c.gen
-	./capturexfont $(HEL10) glutBitmapHelvetica10 > glut_hel10.c.gen
-	./capturexfont $(HEL12) glutBitmapHelvetica12 > glut_hel12.c.gen
-	./capturexfont $(HEL18) glutBitmapHelvetica18 > glut_hel18.c.gen
-
-# unused test rule for test building 16-bit font
-JIS = -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
-glut_jis.c : 
-	./capturexfont $(JIS) glutBitmapJis > $@
-
-sources: $(SRCS)
-
-symcheck: libglut.a
-	-nm -Bo libglut.a | grep -v ' d ' | grep -v ' T glut' | grep -v ' D glut' | grep -v ' U ' | grep -v ' T __glut' | grep -v ' t ' | grep -v ' b ' | grep -v ' D __glut' | grep -v ' B __glut'
-
-dstr.c: glut_dstr.c
-	ln -s glut_dstr.c $@
-
-dstr: dstr.c glut_util.o glut_glxext.o
-	$(RM) $@
-	$(CC) -g -o $@ $(CFLAGS) -DTEST dstr.c glut_util.o glut_glxext.o -lGLU -lGL -lXext -lX11 -lm
-
-./glut.h : glut.h
-./glutint.h : glutint.h
-./glutstroke.h : glutstroke.h
-./strokegen.h : strokegen.h
-./stroke.h : stroke.h
-./layerutil.h : layerutil.h
-strokelex.o: strokelex.c strokegen.h
-
-include $(COMMONRULES)