* 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/progs/demos/lodbias.c b/progs/demos/lodbias.c
index 1d01502..b2fab0b 100644
--- 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"