X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.X11;h=15fc57ca9fdcb763366d2b898e098d7e89297fca;hb=0c527ab0546eb1de9ee10cc31bc386a40e6b3f98;hp=75500e6d5cef891ad1e3a55b6fa56b99c09fcdba;hpb=aba535e765336ceddd23a303514ef7e223b8dc28;p=mesa.git diff --git a/Makefile.X11 b/Makefile.X11 index 75500e6d5ce..15fc57ca9fd 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,9 +1,9 @@ -# $Id: Makefile.X11,v 1.45 2001/06/18 23:39:38 brianp Exp $ +# $Id: Makefile.X11,v 1.61 2002/03/11 14:59:50 brianp Exp $ # Mesa 3-D graphics library -# Version: 3.5 +# Version: 4.1 # -# Copyright (C) 1999-2000 Brian Paul All Rights Reserved. +# Copyright (C) 1999-2001 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"), @@ -42,6 +42,7 @@ default: @echo " make bsdos4 for BSD/OS 4.x, dynamic libraries" @echo " make cygnus for Win95/NT using Cygnus-Win32" @echo " make cygnus-linux for Win95/NT using Cygnus-Win32 under Linux" + @echo " make darwin for Darwin - Mac OS X" @echo " make dgux for Data General" @echo " make freebsd for FreeBSD systems with GCC" @echo " make freebsd-386 for FreeBSD systems with GCC, w/ Intel assembly" @@ -85,6 +86,7 @@ default: @echo " make linux-sparc5-elf for Sparc5 systems, make ELF shared libs" @echo " make linux-sparc-ultra for UltraSparc systems, make ELF shared libs" @echo " make linux-osmesa16 for 16-bit/channel OSMesa" + @echo " make linux-osmesa32 for 32-bit/channel OSMesa" @echo " make lynxos for LynxOS systems with GCC" @echo " make macintosh for Macintosh" @echo " make machten-2.2 for Macs w/ MachTen 2.2 (68k w/ FPU)" @@ -136,10 +138,10 @@ default: # XXX we may have to split up this group of targets into those that # have a C++ compiler and those that don't for the SI-GLU library. -aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \ +aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc \ hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \ hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \ -irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \ +irix4 irix5 irix5-gcc irix5-dso \ linux linux-static linux-debug linux-static-debug linux-prof \ linux-x86 linux-x86-static linux-x86-debug \ linux-glide linux-386-glide linux-386-opt-glide \ @@ -170,12 +172,11 @@ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra: if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi -irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug: +irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug: -mkdir lib32 if [ -d src ] ; then touch src/depend ; fi if [ -d src-glu ] ; then touch src-glu/depend ; fi if [ -d src-glut ] ; then touch src-glut/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 src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi @@ -294,7 +295,7 @@ linux-ggi-install linux-386-ggi-install: # echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \ # fi -linux-osmesa16: +linux-osmesa16 linux-osmesa32: -mkdir lib if [ -d src ] ; then touch src/depend ; fi if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi @@ -321,20 +322,17 @@ clean: # Remove everything that can be remade realclean: clean - -rm -f lib/* + -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 ggi/demos && $(MAKE) -f Makefile.X11 realclean || true - cd src/GGI/default && $(MAKE) -f Makefile.X11 realclean || true - -DIRECTORY = Mesa-3.5 -LIB_NAME = MesaLib-3.5 -DEMO_NAME = MesaDemos-3.5 -GLU_NAME = MesaGLU-3.5 +DIRECTORY = Mesa-4.1 +LIB_NAME = MesaLib-4.1 +DEMO_NAME = MesaDemos-4.1 +GLU_NAME = MesaGLU-4.1 GLUT_NAME = GLUT-3.7 @@ -344,6 +342,7 @@ LIB_FILES = \ $(DIRECTORY)/acconfig.h \ $(DIRECTORY)/acinclude.m4 \ $(DIRECTORY)/aclocal.m4 \ + $(DIRECTORY)/common_rules.make \ $(DIRECTORY)/conf.h.in \ $(DIRECTORY)/config.guess \ $(DIRECTORY)/config.sub \ @@ -372,12 +371,13 @@ 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 \ - $(DIRECTORY)/include/GL/dosmesa.h \ + $(DIRECTORY)/include/GL/dmesa.h \ $(DIRECTORY)/include/GL/amesa.h \ $(DIRECTORY)/include/GL/fxmesa.h \ $(DIRECTORY)/include/GL/ggimesa.h \ @@ -393,6 +393,8 @@ LIB_FILES = \ $(DIRECTORY)/include/GL/mglmesa.h \ $(DIRECTORY)/include/GL/osmesa.h \ $(DIRECTORY)/include/GL/svgamesa.h \ + $(DIRECTORY)/include/GL/ugl*.h \ + $(DIRECTORY)/include/GL/vms_x_fix.h \ $(DIRECTORY)/include/GL/wmesa.h \ $(DIRECTORY)/include/GL/xmesa.h \ $(DIRECTORY)/include/GL/xmesa_x.h \ @@ -403,7 +405,6 @@ LIB_FILES = \ $(DIRECTORY)/src/Makefile* \ $(DIRECTORY)/src/libGL_la_SOURCES \ $(DIRECTORY)/src/descrip.mms \ - $(DIRECTORY)/src/mms_depend \ $(DIRECTORY)/src/mesa.conf \ $(DIRECTORY)/src/*.def \ $(DIRECTORY)/src/depend \ @@ -421,19 +422,16 @@ LIB_FILES = \ $(DIRECTORY)/src/tnl/*.[ch] \ $(DIRECTORY)/src/tnl/Makefile* \ $(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES \ - $(DIRECTORY)/src/Allegro/*.[ch] \ + $(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/*.[ch] \ $(DIRECTORY)/src/BeOS/*.cpp \ - $(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/DOS/*.c \ $(DIRECTORY)/src/FX/Makefile.am \ $(DIRECTORY)/src/FX/Makefile.in \ $(DIRECTORY)/src/FX/libMesaFX_la_SOURCES \ @@ -464,14 +462,18 @@ LIB_FILES = \ $(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/S3/*.[ch] \ - $(DIRECTORY)/src/S3/*.def \ - $(DIRECTORY)/src/S3/*.mak \ - $(DIRECTORY)/src/S3/*.rc \ + $(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/Trace/*.[ch] \ + $(DIRECTORY)/src/Trace/Makefile.am \ + $(DIRECTORY)/src/Trace/Makefile.in \ $(DIRECTORY)/src/Windows/*.[ch] \ $(DIRECTORY)/src/Windows/*.def \ $(DIRECTORY)/src/X/Makefile.am \ @@ -481,23 +483,44 @@ LIB_FILES = \ $(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/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 \ @@ -542,7 +565,24 @@ LIB_FILES = \ $(DIRECTORY)/vms/xlib.opt \ $(DIRECTORY)/vms/xlib_share.opt \ $(DIRECTORY)/BeOS/Makefile \ - $(DIRECTORY)/BeOS/*.cpp \ + $(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.* \ @@ -560,20 +600,20 @@ LIB_FILES = \ $(DIRECTORY)/macos/src-gli/*.[ch] \ $(DIRECTORY)/OpenStep + + DEMO_FILES = \ $(DIRECTORY)/include/GL/glut.h \ $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/include/GL/glut_h.dja \ $(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.dja/* \ - $(DIRECTORY)/src-glut.beos/Makefile \ - $(DIRECTORY)/src-glut.beos/*.cpp \ - $(DIRECTORY)/src-glut.beos/*.h \ + $(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 \ @@ -591,8 +631,19 @@ DEMO_FILES = \ $(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 \ + + SI_GLU_FILES = \ $(DIRECTORY)/Makefile* \ $(DIRECTORY)/Make-config \ @@ -639,13 +690,16 @@ GLUT_FILES = \ $(DIRECTORY)/include/GL/glu_mangle.h \ $(DIRECTORY)/include/GL/glut.h \ $(DIRECTORY)/include/GL/glutf90.h \ - $(DIRECTORY)/include/GL/glut_h.dja \ $(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/*.[ch] + + +OBSOLETE_GLUT_FILES = \ + $(DIRECTORY)/include/GL/glut_h.dja \ $(DIRECTORY)/src-glut.dja/* \ $(DIRECTORY)/src-glut.beos/Makefile \ $(DIRECTORY)/src-glut.beos/*.cpp \