X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.X11;h=d255a424e48c4c075b460b346e01664c9f3a9272;hb=92eac1c76517b1df8183749a0d056ab0618c3f25;hp=3c2124cac21bac0f01f79d0c548a482f0228c24d;hpb=ac018f5494dad2af008a4a64e9c5648b3ec2fcaa;p=mesa.git diff --git a/Makefile.X11 b/Makefile.X11 index 3c2124cac21..d255a424e48 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.36 2000/10/23 00:20:50 gareth Exp $ +# $Id: Makefile.X11,v 1.42 2001/03/17 00:45:01 brianp Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -68,15 +68,15 @@ default: @echo " make linux for Linux systems, make shared .so libs" @echo " make linux-static for Linux systems, make static .a libs" - @echo " make linux-386 for Linux on Intel, make shared .so libs" - @echo " make linux-386-static for Linux on Intel, make static .a libs" + @echo " make linux-trace for Linux systems, with API trace extension" + @echo " make linux-x86 for Linux on Intel, make shared .so libs" + @echo " make linux-x86-static for Linux on Intel, make static .a libs" @echo " make linux-ggi for Linux systems with libggi" @echo " make linux-386-ggi for Linux systems with libggi w/ Intel assembly" @echo " make linux-glide for Linux w/ 3Dfx Glide driver" @echo " make linux-386-glide for Linux w/ 3Dfx Glide driver, Intel assembly" @echo " make linux-386-opt-glide for Linux with 3Dfx Voodoo1 for GLQuake" @echo " make linux-386-opt-V2-glide for Linux with 3Dfx Voodoo2 for GLQuake" - @echo " make linux-x86 for Linux w/ all x86 asm" @echo " make linux-x86-glide for Linux w/ all x86 asm for Glide" @echo " make linux-alpha for Linux on Alpha systems" @echo " make linux-alpha-static for Linux on Alpha systems, static libs" @@ -133,6 +133,9 @@ 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 \ hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \ hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \ @@ -155,11 +158,11 @@ sunos5-thread sunos5-pthread sunos5-gcc-thread sunos5-gcc-pthread \ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra: -mkdir lib if [ -d src ] ; then touch src/depend ; fi - if [ -d src-glu ] ; then touch src-glu/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 src-glu ] ; then cd src-glu ; $(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 @@ -261,14 +264,14 @@ os2-x11: linux-ggi linux-386-ggi: -mkdir lib touch src/depend - touch src-glu/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 src-glut ] ; then cd src-glu ; $(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 ggi ] ; then cd ggi ; $(MAKE) -f Makefile.X11 $@ ; fi if [ -d ggi ] ; then cd ggi/demos; $(MAKE) ; fi @@ -300,6 +303,7 @@ clean: -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/*~ @@ -401,6 +405,14 @@ LIB_FILES = \ $(DIRECTORY)/src/*.def \ $(DIRECTORY)/src/depend \ $(DIRECTORY)/src/*.[chS] \ + $(DIRECTORY)/src/math/*.[ch] \ + $(DIRECTORY)/src/math/Makefile* \ + $(DIRECTORY)/src/swrast/*.[ch] \ + $(DIRECTORY)/src/swrast/Makefile* \ + $(DIRECTORY)/src/swrast_setup/*.[ch] \ + $(DIRECTORY)/src/swrast_setup/Makefile* \ + $(DIRECTORY)/src/tnl/*.[ch] \ + $(DIRECTORY)/src/tnl/Makefile* \ $(DIRECTORY)/src/Allegro/*.[ch] \ $(DIRECTORY)/src/BeOS/*.cpp \ $(DIRECTORY)/src/D3D/*.cpp \ @@ -459,8 +471,19 @@ LIB_FILES = \ $(DIRECTORY)/src/X86/*.[ch] \ $(DIRECTORY)/src/X86/Makefile.am \ $(DIRECTORY)/src/X86/Makefile.in \ - $(DIRECTORY)/src/X86/*.m4 \ $(DIRECTORY)/src/X86/*.S \ + $(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)/src-glu/README[12] \ $(DIRECTORY)/src-glu/Makefile* \ $(DIRECTORY)/src-glu/descrip.mms \ @@ -474,6 +497,7 @@ LIB_FILES = \ $(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 \ @@ -561,6 +585,24 @@ DEMO_FILES = \ $(DIRECTORY)/mtdemos \ $(DIRECTORY)/ggi +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] + GLU_FILES = \ $(DIRECTORY)/Makefile* \ $(DIRECTORY)/Make-config \