aboutsummaryrefslogtreecommitdiffstats
path: root/src/glw/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-151-1/+4
|\
| * Add more package metadata to the pkg-config filesDan Nicholson2008-12-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161.
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * fix DESTDIR omissionsHanno Böck2008-08-151-4/+4
| |
| * Gutsy oopses on touch of existing file. Workaround.Keith Whitwell2007-08-071-0/+1
| |
* | Fixed 'make install' for darwinJeremy Huddleston2008-08-121-1/+1
| |
* | Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston2008-08-111-0/+1
| |
* | autoconf: Support Motif widgets in GLw with --enable-motifDan Nicholson2008-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add an --enable-motif option, which will enable the Motif widgets in libGLw and link it with libXm. The Motif installation information will be gathered from the motif-config script (this comes with LessTif) or fallback to the standard autoconf checks. To allow the location of the Motif headers to be set from configure, the default setting of -I/usr/include/Motif1.2 has been moved into configs/default and then passed to the Makefile through the MOTIF_CFLAGS variable.
* | Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson2008-07-121-1/+1
| | | | | | | | | | Respect the user's choice of shell when running mklib rather than always using /bin/sh.
* | Remove generated pkg-config files on `make clean'Dan Nicholson2008-07-111-1/+1
| |
* | Set library and header installation directories from configurationDan Nicholson2008-07-061-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the installation directories for libraries and headers are resolved within the install commands. For instance, the libraries will be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility of the installation, such as when the libraries should be installed to a subdirectory like /usr/lib/tls. This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR) to define the locations that the libraries and headers are installed. For the static configs, this resolves exactly as before to $(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they are derived directly from the --libdir and --includedir settings.
* | Always cleanup the makedepend backup filesDan Nicholson2008-05-061-1/+1
| | | | | | | | | | | | Consistently cleanup the depend.bak files created by makedepend. Also, realclean has been changed to use a single find command, which speeds it up considerably.
* | Add $(X11_INCLUDES) to shut makedepend up.Hasso Tepper2008-04-091-1/+1
| |
* | add support for LDFLAGS env varDan Nicholson2007-09-281-1/+1
| |
* | pkg-config supportDan Nicholson2007-09-121-1/+11
| |
* | DESTDIR support.Dan Nicholson2007-09-121-4/+4
|/
* New bin/minstall script - a minimal replacement for 'install'.Brian Paul2006-10-191-1/+1
| | | | Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
* LIB_DIR is now just 'lib' or 'lib64'Brian Paul2006-07-131-5/+5
| | | | | Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
* Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.Brian Paul2006-06-261-1/+1
| | | | Probably need to fix the install destinations too...
* New 'install' targets in makefile. See bug 2372.Brian Paul2006-06-221-0/+5
|
* Use X11_INCLUDES config macro instead ofJerome Glisse2006-01-021-1/+1
| | | | hardcoded path in makefile.
* Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' willIan Romanick2005-07-261-1/+1
| | | | work again.
* Added -linker option to mklib, used to specify a particular program forBrian Paul2005-07-251-2/+3
| | | | | linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
* assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul2005-05-071-1/+1
|
* Put quotes around the CC and CXX variables passed to mklib. This makeIan Romanick2005-01-111-1/+1
| | | | them work with multi-work compiler names (e.g., "ccache gcc").
* Improve the behaviour of the build system wrt depend files.Keith Whitwell2004-12-081-1/+1
| | | | | | | | - Remove the -Y option for makedepend, so that the standard directories are searched - No longer pipe the multiple errors that the -Y option caused into /dev/null -- we want to know about these failures. - Fix up a few other misc makedepend failures.
* Make sure mklib sees the definition of CC and CXX. Make mklib respectIan Romanick2004-06-251-1/+1
| | | | | | the definitions of CC and CXX on Linux. This fixed build issues with sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set to a GCC 3.x compiler.
* Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKEEric Anholt2004-06-011-1/+2
| | | | | | variable (defaults to "make") and use that. Use the MKDEP and MKDEP_OPTIONS more. Our shell isn't bash, so change the instances of ">& /dev/null" to a more compatible "> /dev/null 2>&1".
* use MKDEP varBrian Paul2004-04-081-1/+1
|
* Tweaks for make clean / realclean.Brian Paul2004-03-261-0/+2
|
* New Makefile systemBrian Paul2004-03-261-1/+48
|
* just include Makefile.X11Brian Paul1999-12-151-59/+1
|
* Initial revisionjtg1999-08-191-0/+59
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 14:57:15 +0000