Merge branch 'autoconf2'

[mesa.git] / Makefile.DJ

diff --git a/Makefile.DJ b/Makefile.DJ
index 8ad34be32e2fcb270da0846b4f94191d49f3048e..deaac09d18188252b0105e2c2b2184365ed84c98 100644 (file)
--- a/Makefile.DJ
+++ b/Makefile.DJ
@@ -20,9 +20,9 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP makefile v1.5 for Mesa
+# DOS/DJGPP makefile for Mesa
 #
-#  Copyright (C) 2002 - Borca Daniel
+#  Author: Daniel Borca
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 
@@ -31,11 +31,6 @@
 #  Available options:
 #
 #    Environment variables:
-#      CPU             optimize for the given processor.
-#                      default = pentium
-#      GLU=[mesa|sgi]  specify GLU directory; can be `sgi' (requires GNU/C++)
-#                      or `mesa'.
-#                      default = mesa
 #      GLIDE           path to Glide3 SDK; used with FX.
 #                      default = $(TOP)/glide3
 #      FX=1            build for 3dfx Glide3. Note that this disables
@@ -59,12 +54,8 @@
 
 .PHONY : all libgl libglu libglut clean realclean
 
-CPU ?= pentium
-
-GLU ?= mesa
-
 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS += -O2 -ffast-math
 
 export CFLAGS
 
@@ -79,7 +70,7 @@ all: libgl libglu libglut
 libgl: lib
        $(MAKE) -f Makefile.DJ -C src/mesa
 libglu: lib
-       $(MAKE) -f Makefile.DJ -C src/glu/$(GLU)
+       $(MAKE) -f Makefile.DJ -C src/glu/sgi
 libglut: lib
        $(MAKE) -f Makefile.DJ -C src/glut/dos