diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 (patch) | |
tree | d114e55df428550c9829acf929b9fb7bcb89c429 /configs | |
parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b (diff) | |
parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f (diff) |
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'configs')
-rw-r--r-- | configs/autoconf.in | 12 | ||||
-rw-r--r-- | configs/default | 9 | ||||
-rw-r--r-- | configs/linux-dri-xcb | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index ed44a0f1a68..a3eaed5c9d0 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -27,10 +27,10 @@ ASM_API = @ASM_API@ # Misc tools and flags MAKE = @MAKE@ +SHELL = @SHELL@ MKLIB_OPTIONS = @MKLIB_OPTIONS@ MKDEP = @MKDEP@ MKDEP_OPTIONS = @MKDEP_OPTIONS@ -INSTALL = $(TOP)/bin/minstall # Python and flags (generally only needed by the developers) PYTHON2 = python @@ -66,6 +66,10 @@ USING_EGL = @USING_EGL@ # Dependencies X11_INCLUDES = @X11_INCLUDES@ +# GLw motif setup +GLW_SOURCES = @GLW_SOURCES@ +MOTIF_CFLAGS = @MOTIF_CFLAGS@ + # Library/program dependencies GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \ @@ -89,15 +93,15 @@ EXPAT_INCLUDES = @EXPAT_INCLUDES@ prefix = @prefix@ exec_prefix = @exec_prefix@ libdir = @libdir@ +includedir = @includedir@ # Installation directories (for make install) INSTALL_DIR = $(prefix) +INSTALL_LIB_DIR = $(libdir) +INSTALL_INC_DIR = $(includedir) # DRI installation directories DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) - -# Additional per-platform configuration settings -@EXTRA_CONFIG_LINES@ diff --git a/configs/default b/configs/default index 37b693932d6..154797265fd 100644 --- a/configs/default +++ b/configs/default @@ -25,11 +25,13 @@ LDFLAGS = GLU_CFLAGS = # Misc tools and flags +SHELL = /bin/sh +MKLIB = $(SHELL) $(TOP)/bin/mklib MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make -INSTALL = $(TOP)/bin/minstall +INSTALL = $(SHELL) $(TOP)/bin/minstall # Tools for regenerating glapi (generally only needed by the developers) PYTHON2 = python @@ -59,6 +61,7 @@ ASM_SOURCES = # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in # order to build the Motif widget too) GLW_SOURCES = GLwDrawA.c +MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build @@ -84,7 +87,9 @@ APP_LIB_DEPS = -lm # Installation directories (for make install) INSTALL_DIR = /usr/local -DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri +INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) +INSTALL_INC_DIR = $(INSTALL_DIR)/include +DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 69643718adc..6d11f1744c9 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -70,4 +70,4 @@ WINDOW_SYSTEM=dri # gamma are missing because they have not been converted to use the new # interface. DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \ - savage sis tdfx trident unichrome ffb nouveau + savage sis tdfx trident unichrome ffb |