summaryrefslogtreecommitdiff
path: root/src/mesa/Makefile
AgeCommit message (Collapse)Author
2008-09-11mesa: use sources.mak -- need to figure out how to support non-gallium ↵Keith Whitwell
builds also
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-08-12Fixed 'make install' for darwinJeremy Huddleston
2008-08-12mesa: Rename sources to sources.mak.José Fonseca
2008-07-12Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson
Respect the user's choice of shell when running mklib rather than always using /bin/sh.
2008-07-11Remove generated pkg-config files on `make clean'Dan Nicholson
2008-07-06Set library and header installation directories from configurationDan Nicholson
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.
2008-06-23Don't make libmesa.a or libglapi.a depend on asm_subdirsBrian Paul
Since the asm_subdirs target does not actually create a file, make will always consider that it needs to be rebuilt. If libmesa.a and libglapi.a have asm_subdirs as a prerequisite, then they will always need to be rebuilt, too. The correct order will be preserved by the default target, though. This should fix #16358. Conflicts: src/mesa/Makefile cherry-picked from master
2008-06-23Ensure all objects are built when installing DRIDan Nicholson
2008-06-22Ensure all objects are built when installing DRIDan Nicholson
2008-06-22Don't make libmesa.a or libglapi.a depend on asm_subdirsDan Nicholson
Since the asm_subdirs target does not actually create a file, make will always consider that it needs to be rebuilt. If libmesa.a and libglapi.a have asm_subdirs as a prerequisite, then they will always need to be rebuilt, too. The correct order will be preserved by the default target, though. This should fix #16358.
2008-06-15No more drivers/xorgDan Nicholson
Don't try to clean in xorg since GLcore is gone.
2008-06-13mesa: Fix libglapi.a build for driJakob Bornecrantz
2008-06-13gallium: another attempt at fixing libglapi.a compilation for DRI buildsBrian Paul
If building for DRI, make a dummy/empty libglapi.a for now.
2008-06-10gallium: work-around glapi.c build problem for dri configsBrian Paul
2008-06-10add some missing rule dependenciesBrian Paul
2008-06-10add some missing rule dependenciesBrian Paul
2008-06-09s/SOLO/MESA/Brian Paul
2008-06-09s/SOLO/MESA/Brian Paul
2008-06-06mesa: sync up with latest Makefile changes on masterBrian Paul
2008-06-06s/subdirs/asm_subdirs/Brian Paul
2008-06-06move the install rulesBrian Paul
2008-06-06remove stray semicolonBrian Paul
2008-06-06move a beos-ism down into drivers/beos/MakefileBrian Paul
2008-06-06Remove the old, complicated default build rule; use the new driver_subdirs ruleBrian Paul
Also, all the old driver-specific rules are now gone.
2008-06-06remove more old stuff, insert new driver_subdir build rules (but not enabled ↵Brian Paul
yet)
2008-06-06move directfb-libgl into drivers/directfb/MakefileBrian Paul
2008-06-05sync up with Makefile changes on masterBrian Paul
2008-06-05Move fbdev driver construction into src/mesa/drivers/fbdev/MakefileBrian Paul
2008-06-05reorder some lines, more make clean cmdsBrian Paul
2008-06-05Move building of stand-alone Mesa into drivers/x11/MakefileBrian Paul
Also, some re-org, renaming, and general clean-up. We're just a few steps away from removing the all the special case rules for building drivers.
2008-06-05Move construction of libOSMesa.so into src/mesa/drivers/osmesa/MakefileBrian Paul
This removes some cruft from src/mesa/Makefile. Something similar could be done for stand-alone / Xlib-Mesa libGL...
2008-06-05Move construction of libOSMesa.so into src/mesa/drivers/osmesa/MakefileBrian Paul
This removes some cruft from src/mesa/Makefile. Something similar could be done for stand-alone / Xlib-Mesa libGL...
2008-06-05mesa: always build libglapi.a, updated subdir, gl.pc rule code from masterBrian Paul
2008-06-05mesa: Makefile commentBrian Paul
2008-05-07Never fail `make clean'Dan Nicholson
Mostly some pedantic changes such that `make clean' always ignores errors. Also changed the top clean target to do the `touch configs/current' dance instead of realclean.
2008-05-07Run `make clean' in drivers/xorg, tooDan Nicholson
2008-05-07Refactor installation targetsDan Nicholson
Currently, there is a single path in src/mesa/Makefile to install that has a few conditionals in it. This commit changes install to act like default where we loop over $(DRIVER_DIRS), deciding what to do. A new target, install-headers, has been broken out to accomodate installing a standalone OSMesa where neither libGL or gl.pc are wanted.
2008-05-07Ensure recursive makes always propagate errorsDan Nicholson
There were a couple spots left where a recursive make could fail in a chain of commands without stopping.
2008-05-06Prevent makedepend from running multiple timesDan Nicholson
The default target in src/mesa/Makefile calls a recursive $(MAKE). With parallel jobs, this causes makedepend to run twice. Instead, block on the first make until depend has been created.
2008-05-06Error consistently when running recursive makeDan Nicholson
When changing directories and running a sub-make, ensure that both the cd and make commands propagate errors to the parent make.
2008-04-23glcore: build from mesaGeorge Sapountzis
2008-03-10Move make install logic for libGL back into src/mesa/Makefile.Kristian Høgsberg
This makes make install work again for non-glx libGL implementations. The make install logic is split into three sub-targets: install-libgl, install-osmesa, install-drivers. The install target in src/glx/x11 is then implemented using the src/mesa make install-libgl rule. Thanks to Dan Nicholson for pointing out the breakage.
2008-03-08Move libGL install target to the libGL Makefile.Kristian Høgsberg
2008-02-25autoconf: Add gcc search patch to MKDEP_OPTIONS to eliminate warnings.Kristian Høgsberg
Also, use -include to avoid error message when make initially fails to include the non-existent depend file.
2008-02-18Update for llvm -> gallivm rename.José Fonseca
2008-02-18Code reorganization: split gallium and mesa makefiles.José Fonseca
In other words, don't build src/gallium source code from within src/mesa/Makefile. Also, allow to customize which gallium auxiliary dirs, driver driver, winsys dirs get built from the config/* files.
2008-02-15Code reorganization: s/aux/auxiliary/ -- update build.José Fonseca
2008-02-15Code reorganization: update build.José Fonseca
Update the Makefiles and includes for the new paths. Note that there hasn't been no separation of the Makefiles yet, and make is jumping all over the place. That will be taken care shortly. But for now, make should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm might require some minor tweaks.
2008-01-31Fix using "ccache ppu-gcc" for CC and fix parallel buildsIan Romanick
CC wasn't quoted in a couple places in src/mesa/Makefile. Also, the OSMesa link was missing a dependency.