diff options
| author | Brian Paul <[email protected]> | 2006-06-22 22:50:48 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-06-22 22:50:48 +0000 |
| commit | 0e794a1bc6885cf569c3dc07b7fd56725aee2c2e (patch) | |
| tree | 6535a05d50a72c91571c1c366a5f297451b9c8c7 /configs | |
| parent | b4517527ebe9933cd3f49da29a9443c1abaa8242 (diff) | |
New 'install' targets in makefile. See bug 2372.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/aix | 3 | ||||
| -rw-r--r-- | configs/default | 13 | ||||
| -rw-r--r-- | configs/freebsd | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/configs/aix b/configs/aix index a509732876d..313d4c4fdb3 100644 --- a/configs/aix +++ b/configs/aix @@ -10,7 +10,10 @@ CXX = xlC CFLAGS = -O -DAIXV3 -DPTHREADS CXXFLAGS = -O -DAIXV3 -DPTHREADS + +# Misc tools and flags MKLIB_OPTIONS = +COPY_LIBS = cp -f -h # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/default b/configs/default index d85ce14eaf7..ec44c8af2bf 100644 --- a/configs/default +++ b/configs/default @@ -2,6 +2,8 @@ # This is included by other config files which may override some # of these variables. +# Think of this as a base class from which configs are derived. + CONFIG_NAME = default @@ -25,6 +27,8 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make +INSTALL = install +COPY_LIBS = cp -f -d # Python and flags (generally only needed by the developers) PYTHON2 = python @@ -54,9 +58,8 @@ ASM_SOURCES = GLW_SOURCES = GLwDrawA.c -# Directories +# Directories to build LIB_DIR = $(TOP)/lib -INSTALL_PREFIX = /usr/local SRC_DIRS = mesa glu glut/glx glw GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa @@ -72,3 +75,9 @@ GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + + + +# Installation directories (for make install) +INSTALL_DIR = /usr/local +DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri diff --git a/configs/freebsd b/configs/freebsd index c390b8bf9c9..782e0c3219d 100644 --- a/configs/freebsd +++ b/configs/freebsd @@ -9,6 +9,9 @@ CC = cc CXX = c++ MAKE = gmake +# cp -d not supported on FreeBSD (see bug 4435) +COPY_LIBS = cp -f + OPT_FLAGS = -O2 PIC_FLAGS = -fPIC |