* demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.

* demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
Essentially the same.
Program files updated to include "readtex.c", not "../util/readtex.c".
* demos/reflect.c: Likewise for "showbuffer.c".

* Makefile.am (EXTRA_DIST): Added top-level regular files.

* include/GL/Makefile.am (INC_X11): Added glxext.h.

* src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
Mesa GGI headers in dist even if HAVE_GGI is not given.

* configure.in: Look for GLUT and demo source dirs in $srcdir.

* src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
More source list updates in various Makefile.am's.

* Makefile.am (dist-hook): Remove CVS directory from distribution.
(DIST_SUBDIRS): List all possible subdirs here.
(SUBDIRS): Only list subdirs selected for build again.
The above two applied to all subdir Makefile.am's also.

diff --git a/include/GL/Makefile.am b/include/GL/Makefile.am
index 58aded1d538a969f10f6dc568073f6a1f1b454c1..328357031b5e86b8a0725d89e6ff490ddb9bba97 100644 (file)
--- a/include/GL/Makefile.am
+++ b/include/GL/Makefile.am
@@ -2,33 +2,41 @@
 
 GLincludedir = $(includedir)/GL
 
-if HAVE_FX
 INC_FX = fxmesa.h
+INC_GGI = ggimesa.h
+INC_OSMESA = osmesa.h
+INC_SVGA = svgamesa.h
+INC_X11 = glx.h glxext.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
+INC_GLUT = glut.h glutf90.h
+
+if HAVE_FX
+sel_inc_fx = $(INC_FX)
 endif
 
 if HAVE_GGI
-INC_GGI = ggimesa.h
+sel_inc_ggi = $(INC_GGI)
 endif
 
 if HAVE_OSMESA
-INC_OSMESA = osmesa.h
+sel_inc_osmesa = $(INC_OSMESA)
 endif
 
 if HAVE_SVGA
-INC_SVGA = svgamesa.h
+sel_inc_svga = $(INC_SVGA)
 endif
 
 if HAVE_X11
-INC_X11 = glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
+sel_inc_x11 = $(INC_X11)
 endif
 
 if NEED_GLUT
-INC_GLUT = glut.h
+sel_inc_glut = $(INC_GLUT)
 endif
 
-EXTRA_DIST = fxmesa.h ggimesa.h osmesa.h svgamesa.h \
-       glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
-
-GLinclude_HEADERS = gl.h glext.h gl_mangle.h glu.h glu_mangle.h \
+EXTRA_HEADERS = amesa.h dosmesa.h foomesa.h glut_h.dja mesa_wgl.h mglmesa.h \
+       vms_x_fix.h wmesa.h \
        $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
 
+GLinclude_HEADERS = gl.h glext.h gl_mangle.h glu.h glu_mangle.h \
+       $(sel_inc_fx) $(sel_inc_ggi) $(sel_inc_osmesa) $(sel_inc_svga) \
+       $(sel_inc_x11) $(sel_inc_glut)

diff --git a/progs/demos/Makefile.BeOS-R4 b/progs/demos/Makefile.BeOS-R4
index ff3c675369e83c22d02f2dcfc43fa12525baff67..dc8156bd2373b96447ccbfe1a3de7b03fe51b6b7 100644 (file)
--- a/progs/demos/Makefile.BeOS-R4
+++ b/progs/demos/Makefile.BeOS-R4
@@ -1,4 +1,4 @@
-# $Id: Makefile.BeOS-R4,v 1.12 2000/06/27 16:54:18 brianp Exp $
+# $Id: Makefile.BeOS-R4,v 1.13 2000/12/24 22:53:54 pesco Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.3
@@ -64,7 +64,7 @@ PROGS = bounce \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+       $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
 
 
 

diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 395d102f4a1b7d4a8a7352f7bae290e3c907fe24..41175a1c57494ce9ee5bed41a737d894e0f40c69 100644 (file)
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.15 2000/11/01 16:02:52 brianp Exp $
+# $Id: Makefile.X11,v 1.16 2000/12/24 22:53:54 pesco Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -67,7 +67,7 @@ PROGS = bounce \
 
 # make executable from .c file:
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+       $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
 
 # special case: need the -lOSMesa library:
 osdemo: osdemo.c

diff --git a/progs/demos/Makefile.cygnus b/progs/demos/Makefile.cygnus
index 1e5ab0f0ec807341b53b3c717add64881e41acd6..c41c4a60281c423d2568021864241fc95d700225 100644 (file)
--- a/progs/demos/Makefile.cygnus
+++ b/progs/demos/Makefile.cygnus
@@ -1,4 +1,4 @@
-# $Id: Makefile.cygnus,v 1.11 2000/06/27 16:54:18 brianp Exp $
+# $Id: Makefile.cygnus,v 1.12 2000/12/24 22:53:54 pesco Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.3
@@ -66,7 +66,7 @@ PROGS = bounce \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+       $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
 
 
 ##### TARGETS #####

diff --git a/progs/demos/drawpix.c b/progs/demos/drawpix.c
index f86b1386b2a2b3cc371e25e8d6a24b2ee5b388ea..b0496c5c6bad35af62d7263529c2521deb9d314d 100644 (file)
--- a/progs/demos/drawpix.c
+++ b/progs/demos/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.4 2000/09/08 21:45:21 brianp Exp $ */
+/* $Id: drawpix.c,v 1.5 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * glDrawPixels demo/test/benchmark
@@ -8,6 +8,32 @@
 
 /*
  * $Log: drawpix.c,v $
+ * Revision 1.5  2000/12/24 22:53:54  pesco
+ * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
+ * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
+ * Essentially the same.
+ * Program files updated to include "readtex.c", not "../util/readtex.c".
+ * * demos/reflect.c: Likewise for "showbuffer.c".
+ *
+ *
+ * * Makefile.am (EXTRA_DIST): Added top-level regular files.
+ *
+ * * include/GL/Makefile.am (INC_X11): Added glxext.h.
+ *
+ *
+ * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
+ * Mesa GGI headers in dist even if HAVE_GGI is not given.
+ *
+ * * configure.in: Look for GLUT and demo source dirs in $srcdir.
+ *
+ * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
+ * More source list updates in various Makefile.am's.
+ *
+ * * Makefile.am (dist-hook): Remove CVS directory from distribution.
+ * (DIST_SUBDIRS): List all possible subdirs here.
+ * (SUBDIRS): Only list subdirs selected for build again.
+ * The above two applied to all subdir Makefile.am's also.
+ *
  * Revision 1.4  2000/09/08 21:45:21  brianp
  * added dither key option
  *
@@ -40,7 +66,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "../util/readtex.c"  /* a hack, I know */
+#include "readtex.c"
 
 #define IMAGE_FILE "../images/girl.rgb"
 

diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index 100df8156514135b7a58dd57c79f1d63d50c279e..6fa335cef801a4c90c03b3f041fb85517b57ac8c 100644 (file)
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <GL/glut.h>
-#include "../util/readtex.c"
+#include "readtex.c"
 
 #ifdef XMESA
 #include "GL/xmesa.h"

diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c
index 228e448594be08693a97dd89ccc1b6f30ebc40f7..f39d8d16092c2025684018aceb14b2d2cb2153df 100644 (file)
--- a/progs/demos/gloss.c
+++ b/progs/demos/gloss.c
@@ -1,4 +1,4 @@
-/* $Id: gloss.c,v 1.5 2000/08/29 21:17:38 brianp Exp $ */
+/* $Id: gloss.c,v 1.6 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * Specular reflection demo.  The specular highlight is modulated by
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "../util/readtex.c"   /* I know, this is a hack. */
+#include "readtex.c"   /* I know, this is a hack. */
 
 #define SPECULAR_TEXTURE_FILE "../images/reflect.rgb"
 #define BASE_TEXTURE_FILE "../images/tile.rgb"

diff --git a/progs/demos/ipers.c b/progs/demos/ipers.c
index aa15d67b534256a19c826f3c821435daea1c8a2e..d38c4d1ae8878888afd8a9c3368b1ddd12001e4e 100644 (file)
--- a/progs/demos/ipers.c
+++ b/progs/demos/ipers.c
@@ -18,7 +18,7 @@
 
 #include <GL/glut.h>
 
-#include "../util/readtex.c"
+#include "readtex.c"
 
 #ifdef XMESA
 #include "GL/xmesa.h"

diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c
index a25848d50b1f5e3525c132c9946fd8ab2bc56a39..d5b0ceb500ac8cf6a6abf937238bce7feded9137 100644 (file)
--- a/progs/demos/isosurf.c
+++ b/progs/demos/isosurf.c
@@ -1,4 +1,4 @@
-/* $Id: isosurf.c,v 1.6 2000/06/27 17:04:43 brianp Exp $ */
+/* $Id: isosurf.c,v 1.7 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * Display an isosurface of 3-D wind speed volume.  
@@ -33,7 +33,7 @@
 #define GL_GLEXT_LEGACY
 #include "GL/glut.h"
 
-#include "../util/readtex.c"   /* I know, this is a hack.  KW: me too. */
+#include "readtex.c"   /* I know, this is a hack.  KW: me too. */
 #define TEXTURE_FILE "../images/reflect.rgb"
 
 #define LIT                 0x1

diff --git a/progs/demos/lodbias.c b/progs/demos/lodbias.c
index 1d01502d97dc35e960096707dcfa783223c00554..b2fab0b4eb7e4713e5d88e45dd8f22fda68e0ce1 100644 (file)
--- a/progs/demos/lodbias.c
+++ b/progs/demos/lodbias.c
@@ -33,7 +33,7 @@
 #include <GL/glut.h>
 #include <GL/glext.h>
 
-#include "../util/readtex.c"   /* I know, this is a hack. */
+#include "readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_FILE "../images/girl.rgb"
 

diff --git a/progs/demos/multiarb.c b/progs/demos/multiarb.c
index aa0beb9bc7514e4c03c9527b6029bbc7f5d2e80a..2d730988a12a40dbd038940bfee5ecd41dce1cea 100644 (file)
--- a/progs/demos/multiarb.c
+++ b/progs/demos/multiarb.c
@@ -1,4 +1,4 @@
-/* $Id: multiarb.c,v 1.7 2000/11/01 16:02:01 brianp Exp $ */
+/* $Id: multiarb.c,v 1.8 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * GL_ARB_multitexture demo
@@ -12,6 +12,32 @@
 
 /*
  * $Log: multiarb.c,v $
+ * Revision 1.8  2000/12/24 22:53:54  pesco
+ * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
+ * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
+ * Essentially the same.
+ * Program files updated to include "readtex.c", not "../util/readtex.c".
+ * * demos/reflect.c: Likewise for "showbuffer.c".
+ *
+ *
+ * * Makefile.am (EXTRA_DIST): Added top-level regular files.
+ *
+ * * include/GL/Makefile.am (INC_X11): Added glxext.h.
+ *
+ *
+ * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
+ * Mesa GGI headers in dist even if HAVE_GGI is not given.
+ *
+ * * configure.in: Look for GLUT and demo source dirs in $srcdir.
+ *
+ * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
+ * More source list updates in various Makefile.am's.
+ *
+ * * Makefile.am (dist-hook): Remove CVS directory from distribution.
+ * (DIST_SUBDIRS): List all possible subdirs here.
+ * (SUBDIRS): Only list subdirs selected for build again.
+ * The above two applied to all subdir Makefile.am's also.
+ *
  * Revision 1.7  2000/11/01 16:02:01  brianp
  * print number of texture units
  *
@@ -51,7 +77,7 @@
 #include <string.h>
 #include <GL/glut.h>
 
-#include "../util/readtex.c"   /* I know, this is a hack. */
+#include "readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_1_FILE "../images/girl.rgb"
 #define TEXTURE_2_FILE "../images/reflect.rgb"

diff --git a/progs/demos/pixeltex.c b/progs/demos/pixeltex.c
index 4516b3f8631707424aad9269d5f27b14b1f8d548..96e46ef9294e11b22c32446f6a31bb6826f68020 100644 (file)
--- a/progs/demos/pixeltex.c
+++ b/progs/demos/pixeltex.c
@@ -56,7 +56,7 @@
 #include <string.h>
 #include <GL/glut.h>
 #include <GL/glext.h>
-#include "../util/readtex.c"   /* I know, this is a hack. */
+#include "readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_FILE "../images/girl.rgb"
 

diff --git a/progs/demos/reflect.c b/progs/demos/reflect.c
index 6713e042f604089c5ba3c7c5e36968536343a2bd..0d72c9d8d67ee0fb88d75556af7357ecb5705a02 100644 (file)
--- a/progs/demos/reflect.c
+++ b/progs/demos/reflect.c
@@ -1,4 +1,4 @@
-/* $Id: reflect.c,v 1.4 2000/09/15 16:43:57 brianp Exp $ */
+/* $Id: reflect.c,v 1.5 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * Demo of a reflective, texture-mapped surface with OpenGL.
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "GL/glut.h"
-#include "../util/showbuffer.c"
-#include "../util/readtex.c"
+#include "showbuffer.c"
+#include "readtex.c"
 
 
 #define DEG2RAD (3.14159/180.0)

diff --git a/progs/demos/teapot.c b/progs/demos/teapot.c
index 93d1fcba5f7ed3ea4c83ab9754d1e918d5968897..cb1ba4b827246ede03538c99e525be1caa744bda 100644 (file)
--- a/progs/demos/teapot.c
+++ b/progs/demos/teapot.c
@@ -16,7 +16,7 @@
 #endif
 
 #include <GL/glut.h>
-#include "../util/readtex.c"
+#include "readtex.c"
 #include "shadow.c"
 
 #ifdef XMESA

diff --git a/progs/demos/texcyl.c b/progs/demos/texcyl.c
index a0e6224999e30a7b9dbe0b9be2ad4750c409e464..30aded2b3edd93f32b2d63b35f05095d111cf8ff 100644 (file)
--- a/progs/demos/texcyl.c
+++ b/progs/demos/texcyl.c
@@ -1,4 +1,4 @@
-/* $Id: texcyl.c,v 1.3 2000/09/29 23:09:39 brianp Exp $ */
+/* $Id: texcyl.c,v 1.4 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * Textured cylinder demo: lighting, texturing, reflection mapping.
@@ -12,6 +12,32 @@
 
 /*
  * $Log: texcyl.c,v $
+ * Revision 1.4  2000/12/24 22:53:54  pesco
+ * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
+ * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
+ * Essentially the same.
+ * Program files updated to include "readtex.c", not "../util/readtex.c".
+ * * demos/reflect.c: Likewise for "showbuffer.c".
+ *
+ *
+ * * Makefile.am (EXTRA_DIST): Added top-level regular files.
+ *
+ * * include/GL/Makefile.am (INC_X11): Added glxext.h.
+ *
+ *
+ * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
+ * Mesa GGI headers in dist even if HAVE_GGI is not given.
+ *
+ * * configure.in: Look for GLUT and demo source dirs in $srcdir.
+ *
+ * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
+ * More source list updates in various Makefile.am's.
+ *
+ * * Makefile.am (dist-hook): Remove CVS directory from distribution.
+ * (DIST_SUBDIRS): List all possible subdirs here.
+ * (SUBDIRS): Only list subdirs selected for build again.
+ * The above two applied to all subdir Makefile.am's also.
+ *
  * Revision 1.3  2000/09/29 23:09:39  brianp
  * added fps output
  *
@@ -41,7 +67,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "../util/readtex.c"   /* I know, this is a hack. */
+#include "readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_FILE "../images/reflect.rgb"
 

diff --git a/progs/demos/tunnel.c b/progs/demos/tunnel.c
index 431d286603080d8bda0965e2d3c62560715820dd..2244024aaa320e7b93f76ae3367a8143d9281296 100644 (file)
--- a/progs/demos/tunnel.c
+++ b/progs/demos/tunnel.c
@@ -16,7 +16,7 @@
 #endif
 
 #include <GL/glut.h>
-#include "../util/readtex.c"
+#include "readtex.c"
 #include "tunneldat.c"
 
 #ifdef XMESA

diff --git a/progs/demos/tunnel2.c b/progs/demos/tunnel2.c
index e82c2c604dc0fdac89849b8c73a6cbf4a7af26cc..3a6e9f88434b32c54273cb800ccabf9dd9e6829e 100644 (file)
--- a/progs/demos/tunnel2.c
+++ b/progs/demos/tunnel2.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <GL/glut.h>
-#include "../util/readtex.c"
+#include "readtex.c"
 #include "tunneldat.c"
 
 #ifdef FX

diff --git a/progs/demos/winpos.c b/progs/demos/winpos.c
index 7001165deeffb9ab0ef84835e93505e5dcad22b6..b799657b8e9ab28c894066cc1da484947c17d6fc 100644 (file)
--- a/progs/demos/winpos.c
+++ b/progs/demos/winpos.c
@@ -1,4 +1,4 @@
-/* $Id: winpos.c,v 1.2 2000/06/27 17:04:43 brianp Exp $ */
+/* $Id: winpos.c,v 1.3 2000/12/24 22:53:54 pesco Exp $ */
 
 /*
  * Example of how to use the GL_MESA_window_pos extension.
@@ -8,6 +8,32 @@
 
 /*
  * $Log: winpos.c,v $
+ * Revision 1.3  2000/12/24 22:53:54  pesco
+ * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
+ * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
+ * Essentially the same.
+ * Program files updated to include "readtex.c", not "../util/readtex.c".
+ * * demos/reflect.c: Likewise for "showbuffer.c".
+ *
+ *
+ * * Makefile.am (EXTRA_DIST): Added top-level regular files.
+ *
+ * * include/GL/Makefile.am (INC_X11): Added glxext.h.
+ *
+ *
+ * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
+ * Mesa GGI headers in dist even if HAVE_GGI is not given.
+ *
+ * * configure.in: Look for GLUT and demo source dirs in $srcdir.
+ *
+ * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
+ * More source list updates in various Makefile.am's.
+ *
+ * * Makefile.am (dist-hook): Remove CVS directory from distribution.
+ * (DIST_SUBDIRS): List all possible subdirs here.
+ * (SUBDIRS): Only list subdirs selected for build again.
+ * The above two applied to all subdir Makefile.am's also.
+ *
  * Revision 1.2  2000/06/27 17:04:43  brianp
  * fixed compiler warnings
  *
@@ -36,7 +62,7 @@
 #define GL_GLEXT_LEGACY
 #include "GL/glut.h"
 
-#include "../util/readtex.c"  /* a hack, I know */
+#include "readtex.c"  /* a hack, I know */
 
 #define IMAGE_FILE "../images/girl.rgb"