From d1ff1f6798b003a820f5de9fad835ff352f31afe Mon Sep 17 00:00:00 2001
From: pesco <pesco>
Date: Sun, 24 Dec 2000 22:53:54 +0000
Subject: * 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.
---
 progs/demos/Makefile.X11 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'progs/demos/Makefile.X11')

diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 395d102f4a..41175a1c57 100644
--- 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
-- 
cgit v1.2.3