diff options
| -rw-r--r-- | Make-config | 1105 | ||||
| -rw-r--r-- | Makefile.X11 | 654 | ||||
| -rw-r--r-- | progs/demos/Makefile.X11 | 6 | ||||
| -rw-r--r-- | progs/redbook/Makefile.X11 | 2 | ||||
| -rw-r--r-- | progs/samples/Makefile.X11 | 2 | ||||
| -rw-r--r-- | progs/xdemos/Makefile.X11 | 2 | ||||
| -rw-r--r-- | src/glu/mesa/Makefile.X11 | 2 | ||||
| -rw-r--r-- | src/glu/sgi/Makefile.X11 | 2 | ||||
| -rw-r--r-- | src/glut/glx/Makefile.X11 | 16 | ||||
| -rw-r--r-- | src/glw/Makefile.X11 | 15 | ||||
| -rw-r--r-- | src/glw/depend | 7 | ||||
| -rw-r--r-- | src/mesa/Makefile.X11 | 208 |
12 files changed, 652 insertions, 1369 deletions
diff --git a/Make-config b/Make-config index 3292037e42..2b3928c89f 100644 --- a/Make-config +++ b/Make-config @@ -1,64 +1,37 @@ -# $Id: Make-config,v 1.69 2003/04/07 14:45:53 brianp Exp $ +# Mesa Make-config file + +# This file describes the compiler options, etc needed to build Mesa +# on various systems using conventional Makefiles (not autoconf/automake). +# +# To add a new system configuration use an existing config as an example, +# then update the top-level Makefile.X11 file. You may also have to add +# new platform support to the bin/mklib script. + MESA_MAJOR=5 MESA_MINOR=1 MESA_TINY=0 VERSION=$(MESA_MAJOR).$(MESA_MINOR) -# Mesa 3-D graphics library -# -# Copyright (C) 1999-2002 Brian Paul All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# 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. - - -# The following variables are passed to each Makefile: + +# The following variables should be defined for each configuration: # # GL_LIB the name of the Mesa "GL" library file (usually libGL.so) # GLU_LIB the name of the Mesa "GLU" library file (usually libGLU.so) # GLUT_LIB the name of the GLUT library file (usually libglut.so) # GLW_LIB the name of the GLw widget library file (usually libGLw.so) # CC the C compiler (usually cc or gcc) -# CFLAGS flags to C compiler (usually -O) -# MAKELIB the script or command to make a library file +# CXX the C++ compiler (usuall c++ or g++ or CC) +# CFLAGS options for C compiler (like -O) +# CXXFLAGS options for the C++ compiler (like -O) # GL_LIB_DEPS list of libraries which the GL library depends on # GLU_LIB_DEPS list of libraries which the GLU library depends on # GLUT_LIB_DEPS list of libraries which the GLUT library depends on +# GLW_LIB_DEPS list of libraries which the GLw (Xt/OpenGL) library depends on # APP_LIB_DEPS list of libraries which demo programs depend upon # ASM_SOURCES optional list of assembly language files to assemble -# -# -# Optionally, you can add definitions for the INCDIR and LIBDIR variables -# which specify where to find the Mesa include files and where to put the -# Mesa libraries. The defaults are ../include and ../lib. This use of -# overriding makefile macros on the command line should work with most -# variants of make. -# -# If your system supports the X Shared Memory extension add -DUSE_XSHM to the -# CFLAGS line and add -lXext to the GL_LIB_DEPS line. -# -# Some compilers complain about const parameters. Adding -DNO_CONST to the -# CFLAGS line should silence suth warnings. -# -# -# To add a new system configuration just follow the examples below and update -# the top-level Makefile.X11 file. - +# MAKELIB the script or command to make a library file +# XXX MAKELIB is obsolete; edit bin/mklib to support new systems aix: @@ -70,7 +43,7 @@ aix: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -O -DAIXV3" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" aix-sl: @@ -82,28 +55,9 @@ aix-sl: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -O -DAIXV3" \ - "MAKELIB = ../bin/mklib.aix" \ + "MAKELIB = $(TOP)/bin/mklib.aix" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" -# Make-config additions for the Amiga 3000 UX -# Carlyn Voss Iuzzolino 5/8/95: -# Modified gcc part as follows: -# Needed to take out -pedantic because that makes gcc complain about -# ANSI-CC not allowing #ident in Amiga's /usr/include/*.h files. -# Took out -O2 (unrecognized option for gcc on the Amiga). -# Needs /usr/lib/libsocket.a file. -amix: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS =" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lm" - beos-r4: $(MAKE) -f Makefile.BeOS-R4 targets \ "GL_LIB = libGL.so" \ @@ -113,33 +67,8 @@ beos-r4: "OSMESA_LIB = libOSMesa.so" \ "CC = g++" \ "CFLAGS = -O -DNO_CONST" \ - "MAKELIB = ../bin/mklib.beos-r4" \ "APP_LIB_DEPS = " -bsdos: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CFLAGS = -I/usr/X11/include -O2" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm" - -bsdos4: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CFLAGS = -I/usr/X11/include -O2 -fPIC" \ - "MAKELIB = ../bin/mklib.bsdos4" \ - "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm" - cygnus: $(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -148,7 +77,7 @@ cygnus: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "DLLTOOL = dlltool" \ "WING_DIR= /wing" \ "LD = ld" \ @@ -156,9 +85,9 @@ cygnus: -O2 -funroll-loops \ -fexpensive-optimizations -fomit-frame-pointer -ffast-math \ -malign-loops=2 -malign-functions=2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32" + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ + "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32" cygnus-linux: $(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \ @@ -175,8 +104,8 @@ cygnus-linux: -O2 -funroll-loops \ -fexpensive-optimizations -fomit-frame-pointer -ffast-math \ -malign-loops=2 -malign-functions=2" \ - "MAKELIB = ../bin/mklib.cygnus-linux" \ - "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32" + "MAKELIB = $(TOP)/bin/mklib.cygnus-linux" \ + "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32" darwin: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -186,31 +115,16 @@ darwin: "GLW_LIB = libGLw.dylib" \ "OSMESA_LIB = libOSMesa.dylib" \ "CC = cc" \ - "CPLUSPLUS = cc" \ + "CXX = cc" \ "CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \ -funroll-loops -fexpensive-optimizations -no-cpp-precomp \ -dynamic -Ddarwin" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.darwin" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL \ -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" -dgux: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lm" - freebsd: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -219,10 +133,9 @@ freebsd: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.freebsd" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" freebsd-386: @@ -233,50 +146,21 @@ freebsd-386: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.freebsd" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ X86/x86_cliptest.S" -gcc: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lm" - -gcc-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -fPIC -O3" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.gcc-sl" \ - "APP_LIB_DEPS = -lX11 -lm" - #special hidden target, to make a shared lib for ONLY Mesa "core" gcc-mesa-sl: $(MAKE) $(MFLAGS) -f Makefile.X11 libmesa \ "MESA_LIB = libMesa.so" \ "CC = gcc" \ "CFLAGS = -fPIC -O3" \ - "MAKELIB = ../bin/mklib.gcc-sl" \ + "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \ hpux9: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -287,7 +171,7 @@ hpux9: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" hpux9-gcc: @@ -298,10 +182,10 @@ hpux9-gcc: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" hpux9-sl: @@ -313,7 +197,6 @@ hpux9-sl: "OSMESA_LIB = libOSMesa.sl" \ "CC = cc" \ "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.hpux" \ "APP_LIB_DEPS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm" hpux9-gcc-sl: @@ -324,10 +207,9 @@ hpux9-gcc-sl: "GLW_LIB = libGLw.sl" \ "OSMESA_LIB = libOSMesa.sl" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.hpux" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" # The hpux10 configs should work for hpux11 as well. @@ -339,10 +221,10 @@ hpux10: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ - "CPLUSPLUS = aCC" \ + "CXX = aCC" \ "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup" hpux10-sl: @@ -353,10 +235,9 @@ hpux10-sl: "GLW_LIB = libGLw" \ "OSMESA_LIB = libOSMesa" \ "CC = cc" \ - "CPLUSPLUS = aCC" \ + "CXX = aCC" \ "CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.hpux" \ + "CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" hpux10-gcc: @@ -367,10 +248,10 @@ hpux10-gcc: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" hpux10-gcc-sl: @@ -381,67 +262,12 @@ hpux10-gcc-sl: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.hpux" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" -# For IRIX 4: don't use -fullwarn because it causes too much garbage -irix4: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS = -O2 -ansi -prototypes -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lXext -lXmu -lXi -lX11 -lm" - -# On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it -irix5: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" - -# On IRIX 5.2+gcc -irix5-gcc: - make $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O2 -pedantic -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" - -# IRIX 5 using Dynamic Shared Objects (DSO) -irix5-dso: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = cc" \ - "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \ - "MAKELIB = ../bin/mklib.irix5" \ - "APP_LIB_DEPS = -rpath ../lib -lX11 -lXmu -lXi -lm" - # IRIX 6 32-bit Targets # Turn Warnings off for these errors (MIPSpro Compiler 7.30) # 1521: A nonstandard preprocessing directive is used. @@ -457,13 +283,12 @@ irix6-o32: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = cc" \ - "CPLUSPLUS = CC" \ + "CXX = CC" \ "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \ - "CCFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" + "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ + "APP_LIB_DEPS = -32 -glut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm" irix6-o32-dso: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -472,13 +297,12 @@ irix6-o32-dso: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = cc" \ - "CPLUSPLUS = CC" \ + "CXX = CC" \ "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \ - "CCFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ - "MAKELIB = ../bin/mklib.irix6-32" \ - "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lm" + "CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ + "APP_LIB_DEPS = -32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm" irix6-n32: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -487,13 +311,12 @@ irix6-n32: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = cc" \ - "CPLUSPLUS = CC" \ + "CXX = CC" \ "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \ - "CCFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" + "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ + "APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm" irix6-n32-dso: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -502,13 +325,12 @@ irix6-n32-dso: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = cc" \ - "CPLUSPLUS = CC" \ + "CXX = CC" \ "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \ - "CCFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ - "MAKELIB = ../bin/mklib.irix6-n32" \ - "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm" + "CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ + "APP_LIB_DEPS = -n32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lfpe -lm" irix6-gcc-n32-sl: make $(MFLAGS) -f Makefile.X11 targets \ @@ -517,13 +339,12 @@ irix6-gcc-n32-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.irix6-n32" \ - "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lm" + "CXXFLAGS = $(CFLAGS)" \ + "APP_LIB_DEPS = -rpath $(TOP)/lib32 -lX11 -lXmu -lXi -lm" # For IRIX 6-64: -woff: # 1068 - integer conversion resulted in a change of sign @@ -540,11 +361,12 @@ irix6-64: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ - "LIBDIR = ../lib64" \ + "LIBDIR = $(TOP)/lib64" \ "CC = cc" \ + "CXX = CC" \ "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" + "CXXFLAGS = -64 -O3 -ansi -woff 1174" \ + "APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm" irix6-64-dso: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -553,11 +375,12 @@ irix6-64-dso: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ - "LIBDIR = ../lib64" \ + "LIBDIR = $(TOP)/lib64" \ "CC = cc" \ "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.irix6-64" \ - "APP_LIB_DEPS = -rpath ../lib64 -lX11 -lXmu -lXi -lm" + "CXX = CC" \ + "CXXFLAGS = -64 -O3 -ansi -woff 1174" \ + "APP_LIB_DEPS = -64 -rpath $(TOP)/lib64 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lm" linux: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -567,45 +390,14 @@ linux: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ - "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" - -linux-static: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -funroll-loops -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm -lpthread" - -linux-trace: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DMESA_TRACE -I/usr/X11R6/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \ linux-x86: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -615,13 +407,13 @@ linux-x86: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \ - "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ X86/x86_cliptest.S \ @@ -633,20 +425,19 @@ linux-x86: X86/sse_xform3.S X86/sse_xform4.S \ X86/sse_normal.S" -linux-icc: +linux-x86-sse: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ - "CC = icc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \ - "MAKELIB = ../bin/mklib.linux" \ + "CC = gcc" \ + "CXX = g++" \ + "CFLAGS = -mcpu=pentium4 -mfpmath=sse -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ @@ -659,20 +450,19 @@ linux-icc: X86/sse_xform3.S X86/sse_xform4.S \ X86/sse_normal.S" -linux-x86-static: +linux-icc: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "GL_LIB = libGL.so" \ + "GLU_LIB = libGLU.so" \ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ + "CC = icc" \ + "CXX = g++" \ + "CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ @@ -694,14 +484,16 @@ linux-ggi: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ggi" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" + "CXXFLAGS = $(CFLAGS)" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lm -lpthread" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "APP_LIB_DEPS = -lm" # Contributed by Emmanuel marty core@ggi-project.org -linux-386-ggi: +linux-x86-ggi: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ @@ -709,11 +501,13 @@ linux-386-ggi: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ggi" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \ + "CXXFLAGS = $(CFLAGS)" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lm -lpthread" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ X86/x86_cliptest.S" @@ -726,55 +520,14 @@ linux-glide: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL" -linux-386-glide: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ - "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S" - -linux-386-opt-glide: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ - "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S" - linux-x86-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -783,13 +536,13 @@ linux-x86-glide: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \ - "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ X86/x86_cliptest.S \ @@ -810,14 +563,14 @@ linux-alpha: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXX = g++" \ + "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" linux-alpha-static: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -827,10 +580,10 @@ linux-alpha-static: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXX = g++" \ + "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lm" linux-ppc: @@ -841,14 +594,14 @@ linux-ppc: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" linux-ppc-static: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -858,27 +611,29 @@ linux-ppc-static: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm" -linux-sparc-static: +linux-sparc: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ + "GL_LIB = libGL.so" \ + "GLU_LIB = libGLU.so" \ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -funroll-loops -O3 -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lXmu -lXi -lm" + "CXX = g++" \ + "CFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ + "CXXFLAGS = $(CFLAGS)" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" -# Replace -mv8 with -mcypress, -msupersparc or -msparclite as appropriate. linux-sparc5: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -887,14 +642,14 @@ linux-sparc5: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" # 32-bit Sparc ELF userland, on UltraSparc linux-sparc-ultra: @@ -905,24 +660,23 @@ linux-sparc-ultra: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -lm" + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" # 16-bit/channel Mesa using OSMesa driver linux-osmesa16: $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \ "OSMESA16_LIB = libOSMesa16.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -lm -lpthread" \ "APP_LIB_DEPS = -lOSMesa16 -lGL" @@ -931,10 +685,9 @@ linux-osmesa32: $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \ "OSMESA16_LIB = libOSMesa32.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -lm -lpthread" \ "APP_LIB_DEPS = -lOSMesa32 -lGL" @@ -950,40 +703,11 @@ lynxos: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm" -machten-2.2: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -m68881 -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -L/usr/lib/X11 -lX11 -lm" - -machten-4.0: - $(MAKE) targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -L/usr/X11R5/lib -lX11 -lm" - mklinux: $(MAKE) targets \ "GL_LIB = libGL.a" \ @@ -992,10 +716,10 @@ mklinux: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -pedantic -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm" netbsd: @@ -1006,21 +730,11 @@ netbsd: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.netbsd" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" -next: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "DRIVER_SOURCES = OSmesa/osmesa.c" \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "CC = ${MYCC}" \ - "CFLAGS = -traditional-cpp -DOPENSTEP -O4" \ - "MAKELIB = ../bin/mklib.ar-ruv" - openbsd: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -1030,7 +744,9 @@ openbsd: "OSMESA_LIB = libOSMesa.so" \ "CC = cc" \ "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ - "MAKELIB = ../bin/mklib.openbsd" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm" openstep: @@ -1041,7 +757,7 @@ openstep: "OSMESA_LIB = libOSMesa.a" \ "CC = ${MYCC}" \ "CFLAGS = -traditional-cpp -DOPENSTEP -O4" \ - "MAKELIB = ../bin/mklib.openstep" + "MAKELIB = $(TOP)/bin/mklib.openstep" openstep-win32: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1050,42 +766,13 @@ openstep-win32: "GLU_LIB = libGLU.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -DOPENSTEP -O4" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.openstep" - -os2-x11: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = MesaGL.a" \ - "GLU_LIB = MesaGLU.a" \ - "GLUT_LIB = glut.a" \ - "GLW_LIB = GLw.a" \ - "OSMESA_LIB = OSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -Zmt -O3 -m486 -funroll-loops -Wall -Wno-unused -ansi -pedantic -ffast-math -DUSE_X86_ASM -D_SVID_SOURCE -D_BSD_SOURCE -I$(X11ROOT)/XFree86/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ..\\bin\\mklib-emx.cmd " \ - "APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S" + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.openstep" osf1: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" - -osf1-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ @@ -1093,37 +780,11 @@ osf1-sl: "OSMESA_LIB = libOSMesa.so" \ "CC = cc" \ "CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.osf1" \ + "GL_LIB_DEPS = -lX11 -lXext -lm -lm -lpthread" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" -pgi-cygnus: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = pgcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -fast -cyglibs -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lm" - -pgi-mingw32: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = pgcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -fast -msvcrt -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lm" - # QNX V4 & Watcom Compiler qnx: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1134,37 +795,9 @@ qnx: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -O" \ - "MAKELIB = ../bin/mklib.qnx" \ + "MAKELIB = $(TOP)/bin/mklib.qnx" \ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm" -sco: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -O2 -mieee-fp" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm" - -sco5: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -O2 -mieee-fp" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm" - solaris-x86: $(MAKE) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -1174,7 +807,7 @@ solaris-x86: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.solaris" \ + "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" solaris-x86-gcc: @@ -1185,10 +818,10 @@ solaris-x86-gcc: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.solaris" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" sunos4: @@ -1200,7 +833,7 @@ sunos4: "OSMESA_LIB = libOSMesa.a" \ "CC = acc" \ "CFLAGS = -O -DUSE_XSHM -DSUNOS4" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" sunos4-sl: @@ -1223,10 +856,10 @@ sunos4-gcc: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" sunos4-gcc-sl: @@ -1237,10 +870,10 @@ sunos4-gcc-sl: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.sunos4" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.sunos4" \ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" sunos4-gcc-x11r6-sl: @@ -1251,179 +884,44 @@ sunos4-gcc-x11r6-sl: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.sunos4" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.sunos4" \ "APP_LIB_DEPS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm" sunos5: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CPLUSPLUS = CC" \ - "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -sunos5-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = cc" \ - "CPLUSPLUS = CC" \ + "CXX = c++" \ "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../bin/mklib.sunos5" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -sunos5-ultra: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CPLUSPLUS = CC" \ - "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -sunos5-ultra-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = cc" \ - "CPLUSPLUS = CC" \ - "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../bin/mklib.sunos5" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" + "GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm" sunos5-gcc: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -sunos5-gcc-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.sunos5" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -sunos5-x11r6-gcc-sl: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -fPIC -O3 -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.sunos5" \ - "APP_LIB_DEPS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm" - -# Contributed by John Stone -sunos5-pthread: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "CC = cc" \ - "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DPTHREADS" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm" - -# Contributed by John Stone -sunos5-thread: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "CC = cc" \ - "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG -DSOLARIS_THREADS" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm" - -# Contributed by John Stone -sunos5-gcc-thread: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DSOLARIS_THREADS" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm" - -# Contributed by John Stone -sunos5-gcc-pthread: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DPTHREADS" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm" - -# from Ron Metoyer (metoyer@iexist.flw.lucent.com) -sunSolaris-CC: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = CC" \ - "CFLAGS = -O -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" - -#This config doesn't work, Ultrix C compiler isn't ANSI compliant -ultrix: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS = -O -Dconst=/**/" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm" + "CXX = g++" \ + "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ + "CXXFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ + "GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \ + "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm" ultrix-gcc: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1433,25 +931,12 @@ ultrix-gcc: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -pedantic -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "CXXFLAGS = $(CFLAGS)" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm" -# tested on Cray C90 running UNICOS 8.0.4 -unicos: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS =" \ - "MAKELIB = ../bin/mklib/ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" - unixware: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -1461,7 +946,7 @@ unixware: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm" unixware-shared: @@ -1473,36 +958,9 @@ unixware-shared: "OSMESA_LIB = libOSMesa" \ "CC = cc" \ "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \ - "MAKELIB = ../bin/mklib.solaris" \ + "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm" -uwin: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -O2 -I/usr/X11/include " \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm" - -vistra: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -pedantic -O2" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lgen -lm" - - # for debugging on IRIX 5.x systems # -woff 1209 = "controlling expression is constant" # -woff 1210 = "controlling expression is constant" @@ -1516,23 +974,10 @@ irix-debug: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ - "LIBDIR = ../lib32" \ + "LIBDIR = $(TOP)/lib32" \ "CC = cc" \ "CFLAGS = -g -n32 -ansi -fullwarn -DUSE_XSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm" - -DEBUG: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = cc" \ - "CFLAGS = -g -ansi -prototypes -fullwarn -DUSE_XSHM -DDEBUG" \ - "MAKELIB = ../bin/mklib.ar-rcv" \ - "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lfpe -lm" + "APP_LIB_DEPS = -rpath $(TOP)/lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm" # for debugging on Linux systems linux-debug: @@ -1543,29 +988,15 @@ linux-debug: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXX = g++" \ + "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG" \ + "CXXFLAGS = $(CFLAGS)" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ "APP_LIB_DEPS = -lglut -lGLU -lGL" -linux-static-debug: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -DUSE_XSHM -DDEBUG -DMESA_DEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/include/glide -I/usr/local/glide/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm" \ - linux-x86-debug: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -1574,12 +1005,11 @@ linux-x86-debug: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -malign-loops=2 -malign-functions=2 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \ - "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ - "GLU_LIB_DEPS = -L../lib -lGL -lm" \ - "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ @@ -1600,59 +1030,8 @@ linux-glide-debug: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ - "CPLUSPLUS = g++" \ + "CXX = g++" \ "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.linux" \ + "CXXFLAGS = $(CFLAGS)" \ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread" -# for profiling on Linux systems -linux-prof: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -Wall -O2 -pg -ansi -pedantic -ffast-math -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S \ - X86/mmx_blend.S \ - X86/3dnow_xform1.S X86/3dnow_xform2.S \ - X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S \ - FX/X86/fx_3dnow_fastpath.S \ - X86/sse_xform1.S X86/sse_xform2.S \ - X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S " - -linux-glide-prof: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.a" \ - "GLU_LIB = libGLU.a" \ - "GLUT_LIB = libglut.a" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ - "CC = gcc" \ - "CPLUSPLUS = g++" \ - "CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -I/usr/include/glide -I/usr/local/glide/include" \ - "CCFLAGS = $(CFLAGS)" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S \ - X86/mmx_blend.S \ - X86/3dnow_xform1.S X86/3dnow_xform2.S \ - X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S \ - FX/X86/fx_3dnow_fastpath.S \ - X86/sse_xform1.S X86/sse_xform2.S \ - X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S" diff --git a/Makefile.X11 b/Makefile.X11 index 4a525674f4..3457c33252 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.77 2003/06/01 16:25:02 brianp Exp $ +# $Id: Makefile.X11,v 1.78 2003/06/10 14:46:24 brianp Exp $ # Mesa 3-D graphics library # Version: 5.1 @@ -114,101 +114,96 @@ sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \ sunos5 sunos5-gcc \ ultrix-gcc unixware: -mkdir lib - if [ -d src ] ; then touch src/depend ; fi - if [ -d si-glu ] ; then touch si-glu/depend ; fi - if [ -d src-glut ] ; then touch src-glut/depend ; fi - if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/mesa ] ; then touch src/mesa/depend ; fi + if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi + if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi + if [ -d src/glw ] ; then touch src/glw/depend ; fi + if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glw ] ; then cd src/glw ; $(MAKE) -f Makefile.X11 $@ ; fi irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl: -mkdir lib32 - if [ -d src ] ; then touch src/depend ; fi - if [ -d si-glu ] ; then touch si-glu/depend ; fi - if [ -d src-glut ] ; then touch src-glut/depend ; fi - if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/mesa ] ; then touch src/mesa/depend ; fi + if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi + if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi + if [ -d src/glw ] ; then touch src/glw/depend ; fi + if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi irix6-64 irix6-64-dso: -mkdir lib64 - if [ -d src ] ; then touch src/depend ; fi - if [ -d si-glu ] ; then touch si-glu/depend ; fi - if [ -d src-glut ] ; then touch src-glut/depend ; fi - if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/mesa ] ; then touch src/mesa/depend ; fi + if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi + if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi + if [ -d src/glw ] ; then touch src/glw/depend ; fi + if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi beos-r4: -mkdir lib - -rm src/depend - touch src/depend - -rm src-glu/depend - touch src-glu/depend - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi - if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi - if [ -d BeOS ] ; then cd BeOS ; $(MAKE) ; fi - if [ -d src-glut.beos ] ; then cd src-glut.beos ; $(MAKE) ; fi - if [ -d src-glut.beos ] ; then cp src-glut.beos/obj*/libglut.so lib ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi - if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi - if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + -rm src/mesa/depend + touch src/mesa/depend + -rm src/glu/sgi/depend + touch src/glu/sgi/depend + if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + if [ -d src/glut/beos ] ; then cd src/glut/beos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + if [ -d src/glut/beos ] ; then cp src/glut/beos/obj*/libglut.so lib ; fi + if [ -d progs/beos ] ; then cd progs/beos ; $(MAKE) ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi + if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi cygnus cygnus-linux: -mkdir lib touch src/depend touch src-glu/depend - if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glw ] ; then cd src/glw ; $(MAKE) -f Makefile.X11 $@ ; fi openstep: -mkdir lib - cd src ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@ - cd src-glu ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@ + cd src/mesa ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@ + cd src/glu/sgi ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@ linux-ggi linux-x86-ggi: -mkdir lib touch src/depend - touch si-glu/depend - if [ -d src-glut ] ; then touch src-glut/depend ; fi - if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi - if [ -d ggi ] ; then touch ggi/depend ; fi - if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE) ; fi - if [ -d src/GGI/display ] ; then cd src/GGI/display ; $(MAKE) ; fi - if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi -# if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d ggi ] ; then cd ggi ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d ggi ] ; then cd ggi/demos; $(MAKE) ; fi - if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi - if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi + touch src/glu/sgi/depend + if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi + if [ -d src/glw ] ; then touch src/glw/depend ; fi + if [ -d src/mesa ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d ggi/demos ] ; then cd ggi/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi + if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi # if you change GGI_DEST please change it in ggimesa.conf, too. DESTDIR=/usr/local @@ -231,30 +226,27 @@ linux-osmesa16 linux-osmesa32: # Remove .o files, emacs backup files, etc. clean: - -rm -f ggi/*~ *.o - -rm -f src/GGI/default/*~ *.so - -rm -f src/GGI/display/*~ *.so + -rm -f src/mesa/*/*.o + -rm -f src/mesa/drivers/*/*.o + -rm -f src/mesa/drivers/*/*.o -rm -f include/*~ -rm -f include/GL/*~ - -rm -f src/*.o src/*~ src/*.a src/*/*.o src/*/*~ - -rm -f src-glu/*.o src-glu/*~ src-glu/*.a - -rm -f si-glu/*/*.o si-glu/*/*/*.o - -rm -f src-glut/*.o - -rm -f demos/*.o - -rm -f book/*.o book/*~ - -rm -f xdemos/*.o xdemos/*~ - -rm -f samples/*.o samples/*~ - -rm -f ggi/*.o ggi/demos/*.o ggi/*.a - -rm -f widgets-sgi/*.o - -rm -f widgets-mesa/*/*.o + -rm -f src/glu/mesa/*.o src/glu/mesa/*~ src-glu/*.a + -rm -f src/glu/sgi/*/*.o src/glu/sgi/*/*/*.o + -rm -f src/glut/glx/*.o + -rm -f progs/demos/*.o + -rm -f progs/redbook/*.o progs/redbook/*~ + -rm -f progs/xdemos/*.o progs/xdemos/*~ + -rm -f progs/samples/*.o progs/samples/*~ + -rm -f src/glw/*.o # Remove everything that can be remade realclean: clean -rm -fr lib lib32 lib64 - cd demos && $(MAKE) -f Makefile.X11 realclean || true - cd xdemos && $(MAKE) -f Makefile.X11 realclean || true - cd book && $(MAKE) -f Makefile.X11 realclean || true - cd samples && $(MAKE) -f Makefile.X11 realclean || true + cd progs/demos && $(MAKE) -f Makefile.X11 realclean || true + cd progs/xdemos && $(MAKE) -f Makefile.X11 realclean || true + cd progs/redbook && $(MAKE) -f Makefile.X11 realclean || true + cd progs/samples && $(MAKE) -f Makefile.X11 realclean || true # Remove everything not in CVS cvsclean: realclean @@ -277,20 +269,6 @@ GLUT_NAME = GLUT-3.7 LIB_FILES = \ $(DIRECTORY)/Makefile* \ $(DIRECTORY)/Make-config \ - $(DIRECTORY)/acconfig.h \ - $(DIRECTORY)/acinclude.m4 \ - $(DIRECTORY)/aclocal.m4 \ - $(DIRECTORY)/common_rules.make \ - $(DIRECTORY)/conf.h.in \ - $(DIRECTORY)/config.guess \ - $(DIRECTORY)/config.sub \ - $(DIRECTORY)/configure \ - $(DIRECTORY)/configure.in \ - $(DIRECTORY)/install-sh \ - $(DIRECTORY)/ltmain.sh \ - $(DIRECTORY)/missing \ - $(DIRECTORY)/mkinstalldirs \ - $(DIRECTORY)/stamp-h.in \ $(DIRECTORY)/docs/*.html \ $(DIRECTORY)/docs/COPYING \ $(DIRECTORY)/docs/INSTALL.GNU \ @@ -302,9 +280,7 @@ LIB_FILES = \ $(DIRECTORY)/bin/mklib* \ $(DIRECTORY)/descrip.mms \ $(DIRECTORY)/mms-config \ - $(DIRECTORY)/m4/*.m4 \ $(DIRECTORY)/xlib.opt \ - $(DIRECTORY)/mesawin32.mak \ $(DIRECTORY)/include/GL/internal/glcore.h \ $(DIRECTORY)/include/GL/Makefile.in \ $(DIRECTORY)/include/GL/Makefile.am \ @@ -333,264 +309,185 @@ LIB_FILES = \ $(DIRECTORY)/include/GLView.h \ $(DIRECTORY)/include/Makefile.in \ $(DIRECTORY)/include/Makefile.am \ - $(DIRECTORY)/src/Makefile* \ - $(DIRECTORY)/src/libGL_la_SOURCES \ - $(DIRECTORY)/src/descrip.mms \ - $(DIRECTORY)/src/mesa.conf \ - $(DIRECTORY)/src/*.def \ - $(DIRECTORY)/src/depend \ - $(DIRECTORY)/src/*.[chS] \ - $(DIRECTORY)/src/array_cache/*.[ch] \ - $(DIRECTORY)/src/array_cache/Makefile* \ - $(DIRECTORY)/src/array_cache/libMesaAC_la_SOURCES \ - $(DIRECTORY)/src/math/*.[ch] \ - $(DIRECTORY)/src/math/Makefile* \ - $(DIRECTORY)/src/swrast/*.[ch] \ - $(DIRECTORY)/src/swrast/Makefile* \ - $(DIRECTORY)/src/swrast/libMesaSwrast_la_SOURCES \ - $(DIRECTORY)/src/swrast_setup/*.[ch] \ - $(DIRECTORY)/src/swrast_setup/Makefile* \ - $(DIRECTORY)/src/tnl/*.[ch] \ - $(DIRECTORY)/src/tnl/Makefile* \ - $(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES \ - $(DIRECTORY)/src/tnl_dd/*.[ch] \ - $(DIRECTORY)/src/tnl_dd/imm/*.[ch] \ - $(DIRECTORY)/src/tnl_dd/imm/NOTES.imm \ - $(DIRECTORY)/src/windml/*.[ch] \ - $(DIRECTORY)/src/windml/tornado/*.c \ - $(DIRECTORY)/src/windml/tornado/*.cdf \ - $(DIRECTORY)/src/windml/man3/*.3 \ - $(DIRECTORY)/src/windml/man3/*.html \ - $(DIRECTORY)/src/DOS/*.[chS] \ - $(DIRECTORY)/src/DOS/mga/*.[ch] \ - $(DIRECTORY)/src/BeOS/*.cpp \ - $(DIRECTORY)/src/FX/Makefile.am \ - $(DIRECTORY)/src/FX/Makefile.in \ - $(DIRECTORY)/src/FX/libMesaFX_la_SOURCES \ - $(DIRECTORY)/src/FX/*.[ch] \ - $(DIRECTORY)/src/FX/*.def \ - $(DIRECTORY)/src/FX/X86/Makefile.am \ - $(DIRECTORY)/src/FX/X86/Makefile.in \ - $(DIRECTORY)/src/FX/X86/*.[Shc] \ - $(DIRECTORY)/src/GGI/Makefile.am \ - $(DIRECTORY)/src/GGI/Makefile.in \ - $(DIRECTORY)/src/GGI/*.[ch] \ - $(DIRECTORY)/src/GGI/ggimesa.conf.in \ - $(DIRECTORY)/src/GGI/default/*.c \ - $(DIRECTORY)/src/GGI/default/Makefile.am \ - $(DIRECTORY)/src/GGI/default/Makefile.in \ - $(DIRECTORY)/src/GGI/default/genkgi.conf.in \ - $(DIRECTORY)/src/GGI/display/*.c \ - $(DIRECTORY)/src/GGI/display/Makefile.am \ - $(DIRECTORY)/src/GGI/display/Makefile.in \ - $(DIRECTORY)/src/GGI/display/fbdev.conf.in \ - $(DIRECTORY)/src/GGI/include/Makefile.am \ - $(DIRECTORY)/src/GGI/include/Makefile.in \ - $(DIRECTORY)/src/GGI/include/ggi/Makefile.am \ - $(DIRECTORY)/src/GGI/include/ggi/Makefile.in \ - $(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.am \ - $(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.in \ - $(DIRECTORY)/src/GGI/include/ggi/mesa/*.h \ - $(DIRECTORY)/src/KNOWN_BUGS \ - $(DIRECTORY)/src/OSmesa/Makefile.am \ - $(DIRECTORY)/src/OSmesa/Makefile.in \ - $(DIRECTORY)/src/OSmesa/Makefile.win \ - $(DIRECTORY)/src/OSmesa/osmesa.def \ - $(DIRECTORY)/src/OSmesa/*.[ch] \ - $(DIRECTORY)/src/SPARC/*.[chS] \ - $(DIRECTORY)/src/SPARC/Makefile.am \ - $(DIRECTORY)/src/SPARC/Makefile.in \ - $(DIRECTORY)/src/SVGA/Makefile.am \ - $(DIRECTORY)/src/SVGA/Makefile.in \ - $(DIRECTORY)/src/SVGA/*.[ch] \ - $(DIRECTORY)/src/Windows/*.[ch] \ - $(DIRECTORY)/src/Windows/*.def \ - $(DIRECTORY)/src/X/Makefile.am \ - $(DIRECTORY)/src/X/Makefile.in \ - $(DIRECTORY)/src/X/*.[ch] \ - $(DIRECTORY)/src/X86/*.[ch] \ - $(DIRECTORY)/src/X86/Makefile.am \ - $(DIRECTORY)/src/X86/Makefile.in \ - $(DIRECTORY)/src/X86/*.S \ - $(DIRECTORY)/si-glu/Makefile.am \ - $(DIRECTORY)/si-glu/Makefile.in \ - $(DIRECTORY)/si-glu/Makefile.X11 \ - $(DIRECTORY)/si-glu/Makefile.win \ - $(DIRECTORY)/si-glu/Makefile.DJ \ - $(DIRECTORY)/si-glu/glu.def \ - $(DIRECTORY)/si-glu/dummy.cc \ - $(DIRECTORY)/si-glu/descrip.mms \ - $(DIRECTORY)/si-glu/mesaglu.opt \ - $(DIRECTORY)/si-glu/include/gluos.h \ - $(DIRECTORY)/si-glu/include/Makefile.am \ - $(DIRECTORY)/si-glu/include/Makefile.in \ - $(DIRECTORY)/si-glu/libnurbs/Makefile.am \ - $(DIRECTORY)/si-glu/libnurbs/Makefile.in \ - $(DIRECTORY)/si-glu/libnurbs/interface/*.h \ - $(DIRECTORY)/si-glu/libnurbs/interface/*.cc \ - $(DIRECTORY)/si-glu/libnurbs/interface/libNIFac_la_SOURCES \ - $(DIRECTORY)/si-glu/libnurbs/interface/Makefile.am \ - $(DIRECTORY)/si-glu/libnurbs/interface/Makefile.in \ - $(DIRECTORY)/si-glu/libnurbs/internals/*.h \ - $(DIRECTORY)/si-glu/libnurbs/internals/*.cc \ - $(DIRECTORY)/si-glu/libnurbs/internals/libNInt_la_SOURCES \ - $(DIRECTORY)/si-glu/libnurbs/internals/Makefile.am \ - $(DIRECTORY)/si-glu/libnurbs/internals/Makefile.in \ - $(DIRECTORY)/si-glu/libnurbs/nurbtess/*.h \ - $(DIRECTORY)/si-glu/libnurbs/nurbtess/*.cc \ - $(DIRECTORY)/si-glu/libnurbs/nurbtess/libNTess_la_SOURCES \ - $(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.am \ - $(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.in \ - $(DIRECTORY)/si-glu/libtess/README \ - $(DIRECTORY)/si-glu/libtess/alg-outline \ - $(DIRECTORY)/si-glu/libtess/*.[ch] \ - $(DIRECTORY)/si-glu/libtess/libtess_la_SOURCES \ - $(DIRECTORY)/si-glu/libtess/Makefile.am \ - $(DIRECTORY)/si-glu/libtess/Makefile.in \ - $(DIRECTORY)/si-glu/libutil/*.[ch] \ - $(DIRECTORY)/si-glu/libutil/libutil_la_SOURCES \ - $(DIRECTORY)/si-glu/libutil/Makefile.am \ - $(DIRECTORY)/si-glu/libutil/Makefile.in \ - $(DIRECTORY)/src-glu/README[12] \ - $(DIRECTORY)/src-glu/Makefile* \ - $(DIRECTORY)/src-glu/descrip.mms \ - $(DIRECTORY)/src-glu/mms_depend \ - $(DIRECTORY)/src-glu/*.def \ - $(DIRECTORY)/src-glu/depend \ - $(DIRECTORY)/src-glu/*.[ch] \ - $(DIRECTORY)/widgets-mesa/ChangeLog \ - $(DIRECTORY)/widgets-mesa/INSTALL \ - $(DIRECTORY)/widgets-mesa/Makefile.in \ - $(DIRECTORY)/widgets-mesa/README \ - $(DIRECTORY)/widgets-mesa/TODO \ - $(DIRECTORY)/widgets-mesa/configure \ - $(DIRECTORY)/widgets-mesa/configure.in \ - $(DIRECTORY)/widgets-mesa/demos/ChangeLog \ - $(DIRECTORY)/widgets-mesa/demos/Cube \ - $(DIRECTORY)/widgets-mesa/demos/Ed \ - $(DIRECTORY)/widgets-mesa/demos/Makefile.in \ - $(DIRECTORY)/widgets-mesa/demos/Mcube \ - $(DIRECTORY)/widgets-mesa/demos/Tea \ - $(DIRECTORY)/widgets-mesa/demos/*.[ch] \ - $(DIRECTORY)/widgets-mesa/demos/events \ - $(DIRECTORY)/widgets-mesa/include/GL/ChangeLog \ - $(DIRECTORY)/widgets-mesa/include/GL/*.h \ - $(DIRECTORY)/widgets-mesa/include/GL/Makefile.in \ - $(DIRECTORY)/widgets-mesa/man/ChangeLog \ - $(DIRECTORY)/widgets-mesa/man/GL* \ - $(DIRECTORY)/widgets-mesa/man/Makefile.in \ - $(DIRECTORY)/widgets-mesa/man/Mesa* \ - $(DIRECTORY)/widgets-mesa/src/ChangeLog \ - $(DIRECTORY)/widgets-mesa/src/*.c \ - $(DIRECTORY)/widgets-mesa/src/Makefile.in \ - $(DIRECTORY)/widgets-sgi/*.[ch] \ - $(DIRECTORY)/widgets-sgi/Makefile* \ - $(DIRECTORY)/widgets-sgi/README \ - $(DIRECTORY)/util/README \ - $(DIRECTORY)/util/Makefile.am \ - $(DIRECTORY)/util/Makefile.in \ - $(DIRECTORY)/util/*.[ch] \ - $(DIRECTORY)/util/sampleMakefile \ - $(DIRECTORY)/vms/analyze_map.com \ - $(DIRECTORY)/vms/xlib.opt \ - $(DIRECTORY)/vms/xlib_share.opt \ - $(DIRECTORY)/BeOS/Makefile \ - $(DIRECTORY)/BeOS/*.cpp - -OBSOLETE_LIB_FILES = \ - $(DIRECTORY)/src/Allegro/*.[ch] \ - $(DIRECTORY)/src/D3D/*.cpp \ - $(DIRECTORY)/src/D3D/*.CPP \ - $(DIRECTORY)/src/D3D/*.h \ - $(DIRECTORY)/src/D3D/*.H \ - $(DIRECTORY)/src/D3D/*.c \ - $(DIRECTORY)/src/D3D/*.C \ - $(DIRECTORY)/src/D3D/MAKEFILE \ - $(DIRECTORY)/src/D3D/*bat \ - $(DIRECTORY)/src/D3D/*DEF \ - $(DIRECTORY)/src/DOS/DEPEND.DOS \ - $(DIRECTORY)/src/S3/*.[ch] \ - $(DIRECTORY)/src/S3/*.def \ - $(DIRECTORY)/src/S3/*.mak \ - $(DIRECTORY)/src/S3/*.rc \ - $(DIRECTORY)/macos/README \ - $(DIRECTORY)/macos/gli_api/*.h \ - $(DIRECTORY)/macos/cglpane/CGLPane.* \ - $(DIRECTORY)/macos/include-mac/*.h \ - $(DIRECTORY)/macos/libraries/*.stub \ - $(DIRECTORY)/macos/libraries/*Stub \ - $(DIRECTORY)/macos/projects/*.mcp \ - $(DIRECTORY)/macos/projects/*.exp \ - $(DIRECTORY)/macos/projects/*.h \ - $(DIRECTORY)/macos/resources/*.c \ - $(DIRECTORY)/macos/resources/*.r \ - $(DIRECTORY)/macos/resources/*.rsrc \ - $(DIRECTORY)/macos/src-agl/*.exp \ - $(DIRECTORY)/macos/src-agl/*.[ch] \ - $(DIRECTORY)/macos/src-gli/*.[ch] \ - $(DIRECTORY)/OpenStep - + $(DIRECTORY)/src/mesa/Makefile* \ + $(DIRECTORY)/src/mesa/descrip.mms \ + $(DIRECTORY)/src/mesa/mesa.conf \ + $(DIRECTORY)/src/mesa/*.def \ + $(DIRECTORY)/src/mesa/depend \ + $(DIRECTORY)/src/mesa/*.[chS] \ + $(DIRECTORY)/src/mesa/array_cache/*.[ch] \ + $(DIRECTORY)/src/mesa/array_cache/Makefile* \ + $(DIRECTORY)/src/mesa/math/*.[ch] \ + $(DIRECTORY)/src/mesa/math/Makefile* \ + $(DIRECTORY)/src/mesa/swrast/*.[ch] \ + $(DIRECTORY)/src/mesa/swrast/Makefile* \ + $(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \ + $(DIRECTORY)/src/mesa/swrast_setup/Makefile* \ + $(DIRECTORY)/src/mesa/tnl/*.[ch] \ + $(DIRECTORY)/src/mesa/tnl/Makefile* \ + $(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/windml/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/windml/tornado/*.c \ + $(DIRECTORY)/src/mesa/drivers/windml/tornado/*.cdf \ + $(DIRECTORY)/src/mesa/drivers/windml/man3/*.3 \ + $(DIRECTORY)/src/mesa/drivers/windml/man3/*.html \ + $(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \ + $(DIRECTORY)/src/mesa/drivers/dos/mga/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/beos/*.cpp \ + $(DIRECTORY)/src/mesa/drivers/glide/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/glide/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/glide/*.def \ + $(DIRECTORY)/src/mesa/drivers/glide/X86/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/glide/X86/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/glide/X86/*.[Shc] \ + $(DIRECTORY)/src/mesa/drivers/ggi/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \ + $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \ + $(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \ + $(DIRECTORY)/src/mesa/sparc/*.[chS] \ + $(DIRECTORY)/src/mesa/sparc/Makefile.am \ + $(DIRECTORY)/src/mesa/sparc/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/svga/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/svga/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/windows/*.[ch] \ + $(DIRECTORY)/src/mesa/drivers/windows/*.def \ + $(DIRECTORY)/src/mesa/drivers/x11/Makefile.am \ + $(DIRECTORY)/src/mesa/drivers/x11/Makefile.in \ + $(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \ + $(DIRECTORY)/src/mesa/x86/*.[ch] \ + $(DIRECTORY)/src/mesa/x86/Makefile.am \ + $(DIRECTORY)/src/mesa/x86/Makefile.in \ + $(DIRECTORY)/src/mesa/x86/*.S \ + $(DIRECTORY)/src/glu/sgi/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/Makefile.X11 \ + $(DIRECTORY)/src/glu/sgi/Makefile.win \ + $(DIRECTORY)/src/glu/sgi/Makefile.DJ \ + $(DIRECTORY)/src/glu/sgi/glu.def \ + $(DIRECTORY)/src/glu/sgi/dummy.cc \ + $(DIRECTORY)/src/glu/sgi/descrip.mms \ + $(DIRECTORY)/src/glu/sgi/mesaglu.opt \ + $(DIRECTORY)/src/glu/sgi/include/gluos.h \ + $(DIRECTORY)/src/glu/sgi/include/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/include/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libnurbs/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libnurbs/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libtess/README \ + $(DIRECTORY)/src/glu/sgi/libtess/alg-outline \ + $(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \ + $(DIRECTORY)/src/glu/sgi/libtess/libtess_la_SOURCES \ + $(DIRECTORY)/src/glu/sgi/libtess/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libtess/Makefile.in \ + $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] \ + $(DIRECTORY)/src/glu/sgi/libutil/libutil_la_SOURCES \ + $(DIRECTORY)/src/glu/sgi/libutil/Makefile.am \ + $(DIRECTORY)/src/glu/sgi/libutil/Makefile.in \ + $(DIRECTORY)/src/glu/mesa/README[12] \ + $(DIRECTORY)/src/glu/mesa/Makefile* \ + $(DIRECTORY)/src/glu/mesa/descrip.mms \ + $(DIRECTORY)/src/glu/mesa/mms_depend \ + $(DIRECTORY)/src/glu/mesa/*.def \ + $(DIRECTORY)/src/glu/mesa/depend \ + $(DIRECTORY)/src/glu/mesa/*.[ch] \ + $(DIRECTORY)/src/glw/*.[ch] \ + $(DIRECTORY)/src/glw/Makefile* \ + $(DIRECTORY)/src/glw/README \ + $(DIRECTORY)/progs/util/README \ + $(DIRECTORY)/progs/util/Makefile.am \ + $(DIRECTORY)/progs/util/Makefile.in \ + $(DIRECTORY)/progs/util/*.[ch] \ + $(DIRECTORY)/progs/util/sampleMakefile \ + $(DIRECTORY)/vms/analyze_map.com \ + $(DIRECTORY)/vms/xlib.opt \ + $(DIRECTORY)/vms/xlib_share.opt DEMO_FILES = \ - $(DIRECTORY)/include/GL/glut.h \ - $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/src-glut/Makefile* \ - $(DIRECTORY)/src-glut/depend \ - $(DIRECTORY)/src-glut/*def \ - $(DIRECTORY)/src-glut/descrip.mms \ - $(DIRECTORY)/src-glut/mms_depend \ - $(DIRECTORY)/src-glut/*.[ch] \ - $(DIRECTORY)/src-glut.dos/*.[ch] \ - $(DIRECTORY)/src-glut.dos/Makefile.DJ \ - $(DIRECTORY)/src-glut.dos/PC_HW/*.[chS] \ - $(DIRECTORY)/images/* \ - $(DIRECTORY)/demos/Makefile* \ - $(DIRECTORY)/demos/descrip.mms \ - $(DIRECTORY)/demos/*.[ch] \ - $(DIRECTORY)/demos/*.cxx \ - $(DIRECTORY)/demos/*.dat \ - $(DIRECTORY)/demos/README \ - $(DIRECTORY)/xdemos/Makefile* \ - $(DIRECTORY)/xdemos/descrip.mms \ - $(DIRECTORY)/xdemos/*.[chf] \ - $(DIRECTORY)/book/Makefile* \ - $(DIRECTORY)/book/README \ - $(DIRECTORY)/book/*.[ch] \ - $(DIRECTORY)/samples/Makefile* \ - $(DIRECTORY)/samples/README \ - $(DIRECTORY)/samples/*.c \ - $(DIRECTORY)/mtdemos \ - $(DIRECTORY)/windmldemos/Makefile.ugl \ - $(DIRECTORY)/windmldemos/*.c \ - $(DIRECTORY)/windmldemos/*.bmp \ - $(DIRECTORY)/ggi - -OBSOLETE_DEMO_FILES = \ - $(DIRECTORY)/include/GL/glut_h.dja \ - $(DIRECTORY)/src-glut.dja/* \ - $(DIRECTORY)/src-glut.beos/Makefile \ - $(DIRECTORY)/src-glut.beos/*.cpp \ - $(DIRECTORY)/src-glut.beos/*.h \ - + $(DIRECTORY)/include/GL/glut.h \ + $(DIRECTORY)/include/GL/glutf90.h \ + $(DIRECTORY)/src/glut/glx/Makefile* \ + $(DIRECTORY)/src/glut/glx/depend \ + $(DIRECTORY)/src/glut/glx/*def \ + $(DIRECTORY)/src/glut/glx/descrip.mms \ + $(DIRECTORY)/src/glut/glx/mms_depend \ + $(DIRECTORY)/src/glut/glx/*.[ch] \ + $(DIRECTORY)/src/glut/glx.dos/*.[ch] \ + $(DIRECTORY)/src/glut/glx.dos/Makefile.DJ \ + $(DIRECTORY)/src/glut/glx.dos/PC_HW/*.[chS] \ + $(DIRECTORY)/progs/images/* \ + $(DIRECTORY)/progs/demos/Makefile* \ + $(DIRECTORY)/progs/demos/descrip.mms \ + $(DIRECTORY)/progs/demos/*.[ch] \ + $(DIRECTORY)/progs/demos/*.cxx \ + $(DIRECTORY)/progs/demos/*.dat \ + $(DIRECTORY)/progs/demos/README \ + $(DIRECTORY)/progs/xdemos/Makefile* \ + $(DIRECTORY)/progs/xdemos/descrip.mms \ + $(DIRECTORY)/progs/xdemos/*.[chf] \ + $(DIRECTORY)/progs/redbook/Makefile* \ + $(DIRECTORY)/progs/redbook/README \ + $(DIRECTORY)/progs/redbook/*.[ch] \ + $(DIRECTORY)/progs/samples/Makefile* \ + $(DIRECTORY)/progs/samples/README \ + $(DIRECTORY)/progs/samples/*.c \ + $(DIRECTORY)/progs/windml/Makefile.ugl \ + $(DIRECTORY)/progs/windml/*.c \ + $(DIRECTORY)/progs/windml/*.bmp \ + $(DIRECTORY)/progs/ggi/*.c SI_GLU_FILES = \ - $(DIRECTORY)/Makefile* \ - $(DIRECTORY)/Make-config \ - $(DIRECTORY)/bin/mklib* \ - $(DIRECTORY)/include/GL/glu.h \ - $(DIRECTORY)/si-glu/Makefile.X11 \ - $(DIRECTORY)/si-glu/include/gluos.h \ - $(DIRECTORY)/si-glu/libnurbs/interface/*.h \ - $(DIRECTORY)/si-glu/libnurbs/interface/*.cc \ - $(DIRECTORY)/si-glu/libnurbs/internals/*.h \ - $(DIRECTORY)/si-glu/libnurbs/internals/*.cc \ - $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.h \ - $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.cc \ - $(DIRECTORY)/si-glu/libtess/README \ - $(DIRECTORY)/si-glu/libtess/alg-outline \ - $(DIRECTORY)/si-glu/libtess/*.[ch] \ - $(DIRECTORY)/si-glu/libutil/*.[ch] + $(DIRECTORY)/Makefile* \ + $(DIRECTORY)/Make-config \ + $(DIRECTORY)/bin/mklib* \ + $(DIRECTORY)/include/GL/glu.h \ + $(DIRECTORY)/src/glu/sgi/Makefile.X11 \ + $(DIRECTORY)/src/glu/sgi/include/gluos.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.h \ + $(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.cc \ + $(DIRECTORY)/src/glu/sgi/libtess/README \ + $(DIRECTORY)/src/glu/sgi/libtess/alg-outline \ + $(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \ + $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] GLU_FILES = \ $(DIRECTORY)/Makefile* \ @@ -601,13 +498,13 @@ GLU_FILES = \ $(DIRECTORY)/include/GL/glext.h \ $(DIRECTORY)/include/GL/glu.h \ $(DIRECTORY)/include/GL/glu_mangle.h \ - $(DIRECTORY)/src-glu/README[12] \ - $(DIRECTORY)/src-glu/Makefile* \ - $(DIRECTORY)/src-glu/descrip.mms \ - $(DIRECTORY)/src-glu/mms_depend \ - $(DIRECTORY)/src-glu/*.def \ - $(DIRECTORY)/src-glu/depend \ - $(DIRECTORY)/src-glu/*.[ch] + $(DIRECTORY)/src/glu/mesa/README[12] \ + $(DIRECTORY)/src/glu/mesa/Makefile* \ + $(DIRECTORY)/src/glu/mesa/descrip.mms \ + $(DIRECTORY)/src/glu/mesa/mms_depend \ + $(DIRECTORY)/src/glu/mesa/*.def \ + $(DIRECTORY)/src/glu/mesa/depend \ + $(DIRECTORY)/src/glu/mesa/*.[ch] GLUT_FILES = \ $(DIRECTORY)/Makefile* \ @@ -620,20 +517,13 @@ GLUT_FILES = \ $(DIRECTORY)/include/GL/glu_mangle.h \ $(DIRECTORY)/include/GL/glut.h \ $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/src-glut/Makefile* \ - $(DIRECTORY)/src-glut/depend \ - $(DIRECTORY)/src-glut/*def \ - $(DIRECTORY)/src-glut/descrip.mms \ - $(DIRECTORY)/src-glut/mms_depend \ - $(DIRECTORY)/src-glut/*.[ch] - - -OBSOLETE_GLUT_FILES = \ - $(DIRECTORY)/include/GL/glut_h.dja \ - $(DIRECTORY)/src-glut.dja/* \ - $(DIRECTORY)/src-glut.beos/Makefile \ - $(DIRECTORY)/src-glut.beos/*.cpp \ - $(DIRECTORY)/src-glut.beos/*.h + $(DIRECTORY)/src/glut/glx/Makefile* \ + $(DIRECTORY)/src/glut/glx/depend \ + $(DIRECTORY)/src/glut/glx/*def \ + $(DIRECTORY)/src/glut/glx/descrip.mms \ + $(DIRECTORY)/src/glut/glx/mms_depend \ + $(DIRECTORY)/src/glut/glx/*.[ch] + lib_gz: diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11 index 7c6c8500be..ee98f59da9 100644 --- a/progs/demos/Makefile.X11 +++ b/progs/demos/Makefile.X11 @@ -3,7 +3,7 @@ ##### MACROS ##### -TOP = .. +TOP = ../.. INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib @@ -90,10 +90,10 @@ targets: readtex.c readtex.h $(PROGS) readtex.c: - cp $(TOP)/util/readtex.c . + cp $(TOP)/progs/util/readtex.c . readtex.h: - cp $(TOP)/util/readtex.h . + cp $(TOP)/progs/util/readtex.h . include $(TOP)/Make-config diff --git a/progs/redbook/Makefile.X11 b/progs/redbook/Makefile.X11 index 0a3a87bf54..f72ea44cd4 100644 --- a/progs/redbook/Makefile.X11 +++ b/progs/redbook/Makefile.X11 @@ -3,7 +3,7 @@ ##### MACROS ##### -TOP = .. +TOP = ../.. INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11 index b18a19584a..8a63517951 100644 --- a/progs/samples/Makefile.X11 +++ b/progs/samples/Makefile.X11 @@ -3,7 +3,7 @@ ##### MACROS ##### -TOP = .. +TOP = ../.. INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11 index 27b4342309..36fa9e57d0 100644 --- a/progs/xdemos/Makefile.X11 +++ b/progs/xdemos/Makefile.X11 @@ -3,7 +3,7 @@ ##### MACROS ##### -TOP = .. +TOP = ../.. INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11 index 3ba1570482..b50db58c36 100644 --- a/src/glu/mesa/Makefile.X11 +++ b/src/glu/mesa/Makefile.X11 @@ -10,7 +10,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config VPATH = RCS -TOP = .. +TOP = ../../.. INCDIR = $(TOP)/include LIBDIR = $(TOP)/lib diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11 index 9c79d0d6fc..76befaa0fa 100644 --- a/src/glu/sgi/Makefile.X11 +++ b/src/glu/sgi/Makefile.X11 @@ -12,7 +12,7 @@ GLU_LIB_NAME = "GLU" # may be overridden in Make-config VPATH = RCS -TOP = .. +TOP = ../../.. INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess LIBDIR = $(TOP)/lib diff --git a/src/glut/glx/Makefile.X11 b/src/glut/glx/Makefile.X11 index c448b64b6a..0427f3f5fb 100644 --- a/src/glut/glx/Makefile.X11 +++ b/src/glut/glx/Makefile.X11 @@ -1,5 +1,3 @@ -# $Id: Makefile.X11,v 1.3 2002/08/17 00:20:48 brianp Exp $ - # Makefile for GLUT # # NOTICE: The OpenGL Utility Toolkit (GLUT) distribution contains source @@ -23,8 +21,9 @@ GLUT_TINY = 1 VPATH = RCS -INCDIR = ../include -LIBDIR = ../lib +TOP = ../../.. +INCDIR = $(TOP)/include +LIBDIR = $(TOP)/lib SOURCES = \ glut_8x13.c \ @@ -102,10 +101,11 @@ targets: $(LIBDIR)/$(GLUT_LIB) # Make the library $(LIBDIR)/$(GLUT_LIB): $(OBJECTS) - $(MAKELIB) $(GLUT_LIB) $(GLUT_MAJOR) $(GLUT_MINOR) $(GLUT_TINY) $(OBJECTS) - mv $(GLUT_LIB)* $(LIBDIR) + $(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ + -patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIBDIR) \ + $(OBJECTS) -include ../Make-config +include $(TOP)/Make-config include depend @@ -116,4 +116,4 @@ include depend # by any source file. # dep: $(SOURCES) - makedepend -fdepend -Y -I../include $(SOURCES) + makedepend -fdepend -Y -I$(TOP)/include $(SOURCES) diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11 index a494e357f9..90b7f9d35f 100644 --- a/src/glw/Makefile.X11 +++ b/src/glw/Makefile.X11 @@ -7,10 +7,12 @@ MAJOR = 1 MINOR = 0 TINY = 0 +TOP = ../.. + VPATH = RCS -INCDIRS = -I../include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include -LIBDIR = ../lib +INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/X11R6/include +LIBDIR = $(TOP)/lib # Use these sources for Motif (and Xt) support. Requires Motif header files. #SOURCES = GLwDrawA.c GLwMDrawA.c @@ -43,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message # Make the library $(LIBDIR)/$(GLW_LIB): $(OBJECTS) - $(MAKELIB) $(GLW_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) - mv $(GLW_LIB)* $(LIBDIR) - -mv *.a $(LIBDIR) + $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \ + -patch $(TINY) $(GLW_LIB_DEPS) -install $(LIBDIR) $(OBJECTS) message: @@ -56,7 +57,7 @@ message: @echo -include ../Make-config +include $(TOP)/Make-config include depend @@ -67,4 +68,4 @@ include depend # by any source file. # dep: $(SOURCES) - makedepend -fdepend -Y -I../include $(SOURCES) + makedepend -fdepend -Y -I$(TOP)/include $(SOURCES) diff --git a/src/glw/depend b/src/glw/depend index e0c23de53d..00bd839104 100644 --- a/src/glw/depend +++ b/src/glw/depend @@ -1,6 +1,5 @@ # DO NOT DELETE -GLwDrawA.o: ../include/GL/glx.h ../include/GL/gl.h ../include/GL/xmesa.h -GLwDrawA.o: GLwDrawAP.h GLwDrawA.h -GLwMDrawA.o: GLwDrawA.c ../include/GL/glx.h ../include/GL/gl.h -GLwMDrawA.o: ../include/GL/xmesa.h GLwDrawAP.h GLwDrawA.h GLwMDrawAP.h +GLwDrawA.o: ../../include/GL/glx.h ../../include/GL/gl.h +GLwDrawA.o: ../../include/GL/glext.h ../../include/GL/glxext.h GLwDrawAP.h +GLwDrawA.o: GLwDrawA.h diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 6300b601a1..fbc5713d03 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,5 +1,3 @@ -# $Id: Makefile.X11,v 1.79 2003/04/17 02:33:11 brianp Exp $ - # Mesa 3-D graphics library # Version: 5.1 # Copyright (C) 1995-2003 Brian Paul @@ -9,77 +7,81 @@ ##### MACROS ##### +TOP = ../.. + GL_MAJOR = 1 GL_MINOR = 4 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) +GL_LIB_NAME = "GL" # may be overridden in Make-config +OSMESA_LIB_NAME = "OSMesa" # may be overridden in Make-config + VPATH = RCS -INCDIR = ../include -LIBDIR = ../lib +LIBDIR = $(TOP)/lib CORE_SOURCES = \ - api_arrayelt.c \ - api_loopback.c \ - api_noop.c \ - api_validate.c \ - accum.c \ - arbprogram.c \ - attrib.c \ - blend.c \ - bufferobj.c \ - buffers.c \ - clip.c \ - colortab.c \ - context.c \ - convolve.c \ - debug.c \ - depth.c \ - dispatch.c \ - dlist.c \ - drawpix.c \ - enable.c \ - enums.c \ - eval.c \ - extensions.c \ - feedback.c \ - fog.c \ - get.c \ - glapi.c \ - glthread.c \ - hash.c \ - hint.c \ - histogram.c \ - image.c \ - imports.c \ - light.c \ - lines.c \ - matrix.c \ - nvprogram.c \ - nvfragparse.c \ - nvvertexec.c \ - nvvertparse.c \ - pixel.c \ - points.c \ - polygon.c \ - rastpos.c \ - state.c \ - stencil.c \ - texcompress.c \ - texformat.c \ - teximage.c \ - texobj.c \ - texstate.c \ - texstore.c \ - texutil.c \ - varray.c \ - vtxfmt.c \ - X86/x86.c \ - X86/common_x86.c \ - X86/3dnow.c \ - X86/sse.c \ + glapi/glapi.c \ + glapi/glthread.c \ + main/api_arrayelt.c \ + main/api_loopback.c \ + main/api_noop.c \ + main/api_validate.c \ + main/accum.c \ + main/arbprogram.c \ + main/attrib.c \ + main/blend.c \ + main/bufferobj.c \ + main/buffers.c \ + main/clip.c \ + main/colortab.c \ + main/context.c \ + main/convolve.c \ + main/debug.c \ + main/depth.c \ + main/dispatch.c \ + main/dlist.c \ + main/drawpix.c \ + main/enable.c \ + main/enums.c \ + main/eval.c \ + main/extensions.c \ + main/feedback.c \ + main/fog.c \ + main/get.c \ + main/hash.c \ + main/hint.c \ + main/histogram.c \ + main/image.c \ + main/imports.c \ + main/light.c \ + main/lines.c \ + main/matrix.c \ + main/nvprogram.c \ + main/nvfragparse.c \ + main/nvvertexec.c \ + main/nvvertparse.c \ + main/pixel.c \ + main/points.c \ + main/polygon.c \ + main/rastpos.c \ + main/state.c \ + main/stencil.c \ + main/texcompress.c \ + main/texformat.c \ + main/teximage.c \ + main/texobj.c \ + main/texstate.c \ + main/texstore.c \ + main/texutil.c \ + main/varray.c \ + main/vtxfmt.c \ + x86/x86.c \ + x86/common_x86.c \ + x86/3dnow.c \ + x86/sse.c \ math/m_debug_clip.c \ math/m_debug_norm.c \ math/m_debug_xform.c \ @@ -146,29 +148,29 @@ CORE_SOURCES = \ DRIVER_SOURCES = \ - FX/fxapi.c \ - FX/fxdd.c \ - FX/fxddspan.c \ - FX/fxddtex.c \ - FX/fxsetup.c \ - FX/fxtexman.c \ - FX/fxtris.c \ - FX/fxvb.c \ - FX/fxglidew.c \ - X/glxapi.c \ - X/fakeglx.c \ - X/xfonts.c \ - X/xm_api.c \ - X/xm_dd.c \ - X/xm_line.c \ - X/xm_span.c \ - X/xm_tri.c \ - SVGA/svgamesa.c \ - SVGA/svgamesa8.c \ - SVGA/svgamesa15.c \ - SVGA/svgamesa16.c \ - SVGA/svgamesa24.c \ - SVGA/svgamesa32.c + drivers/glide/fxapi.c \ + drivers/glide/fxdd.c \ + drivers/glide/fxddspan.c \ + drivers/glide/fxddtex.c \ + drivers/glide/fxsetup.c \ + drivers/glide/fxtexman.c \ + drivers/glide/fxtris.c \ + drivers/glide/fxvb.c \ + drivers/glide/fxglidew.c \ + drivers/x11/glxapi.c \ + drivers/x11/fakeglx.c \ + drivers/x11/xfonts.c \ + drivers/x11/xm_api.c \ + drivers/x11/xm_dd.c \ + drivers/x11/xm_line.c \ + drivers/x11/xm_span.c \ + drivers/x11/xm_tri.c \ + drivers/svga/svgamesa.c \ + drivers/svga/svgamesa8.c \ + drivers/svga/svgamesa15.c \ + drivers/svga/svgamesa16.c \ + drivers/svga/svgamesa24.c \ + drivers/svga/svgamesa32.c ASM_SOURCES = @@ -182,18 +184,28 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \ CORE_OBJECTS = $(CORE_SOURCES:.c=.o) -OSMESA_SOURCES = OSmesa/osmesa.c -OSMESA_OBJECTS = OSmesa/osmesa.o +OSMESA_SOURCES = drivers/osmesa/osmesa.c +OSMESA_OBJECTS = drivers/osmesa/osmesa.o + +INCLUDE_DIRS = \ + -I$(TOP)/include \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main \ + -I$(TOP)/src/mesa/glapi \ + -I$(TOP)/src/mesa/math \ + -I$(TOP)/src/mesa/transform \ + -I$(TOP)/src/mesa/swrast \ + -I$(TOP)/src/mesa/swrast_setup ##### RULES ##### .c.o: - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ .S.o: - $(CC) -c -I. $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ X86/x86.o: X86/x86.c @@ -228,16 +240,17 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) # Make the GL library $(LIBDIR)/$(GL_LIB): $(OBJECTS) - $(MAKELIB) $(GL_LIB) $(GL_MAJOR) $(GL_MINOR) $(GL_TINY) $(OBJECTS) - rm -f $(LIBDIR)/$(GL_LIB)* - mv $(GL_LIB)* $(LIBDIR) + $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \ + -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \ + $(GL_LIB_DEPS) $(OBJECTS) # Make the OSMesa library $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) - if [ ${OSMESA_LIB} ] ; then $(MAKELIB) $(OSMESA_LIB) $(MESA_MAJOR) $(MESA_MINOR) $(GL_TINY) $(OSMESA_OBJECTS) ; fi - if [ ${OSMESA_LIB} ] ; then rm -f $(LIBDIR)/$(OSMESA_LIB)* ; fi - if [ ${OSMESA_LIB} ] ; then mv $(OSMESA_LIB)* $(LIBDIR) ; fi + if [ ${OSMESA_LIB} ] ; then $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) \ + -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(GL_TINY) \ + -L$(LIBDIR) -l$(GL_LIB_NAME) -install $(LIBDIR) \ + $(OSMESA_OBJECTS) ; fi # Make an optional library with _just_ core objects libmesa: $(LIBDIR)/$(MESA_LIB) @@ -245,9 +258,10 @@ libmesa: $(LIBDIR)/$(MESA_LIB) if [ ${MESA_LIB} ] ; then rm -f $(LIBDIR)/$(MESA_LIB)* ; fi if [ ${MESA_LIB} ] ; then mv $(MESA_LIB)* $(LIBDIR) ; fi + $(LIBDIR)/$(MESA_LIB): $(CORE_OBJECTS) -include ../Make-config +include $(TOP)/Make-config include depend |