diff options
| author | pesco <pesco> | 2000-12-24 22:53:54 +0000 |
|---|---|---|
| committer | pesco <pesco> | 2000-12-24 22:53:54 +0000 |
| commit | d1ff1f6798b003a820f5de9fad835ff352f31afe (patch) | |
| tree | 63087d7f74fbc3694e375d32c3067fe40675894e /include | |
| parent | 05ecec6f49732d8804982cdb350798a9fc7b81d9 (diff) | |
* 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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/Makefile.am | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/include/GL/Makefile.am b/include/GL/Makefile.am index 58aded1d53..328357031b 100644 --- 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) |