diff options
| -rw-r--r-- | Make-config | 7 | ||||
| -rw-r--r-- | bin/mklib.solaris | 52 |
2 files changed, 1 insertions, 58 deletions
diff --git a/Make-config b/Make-config index c03538894b9..35b81099afa 100644 --- a/Make-config +++ b/Make-config @@ -170,7 +170,7 @@ gcc-sl: "CFLAGS = -fPIC -O3" \ "CXXFLAGS = -fPIC -O3" \ "GLUT_CFLAGS = -fexceptions" \ - "MAKELIB = ../bin/mklib.gcc-sl" \ + "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \ "APP_LIB_DEPS = -lX11 -lm" #special hidden target, to make a shared lib for ONLY Mesa "core" @@ -832,7 +832,6 @@ solaris-x86: "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \ - "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" solaris-x86-gcc: @@ -847,7 +846,6 @@ solaris-x86-gcc: "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \ "CXXFLAGS = -O3 -m486 -fPIC" \ "GLUT_CFLAGS = -fexceptions" \ - "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" sunos4: @@ -953,7 +951,6 @@ sunos5-smp: "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \ "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \ - "MAKELIB = ../bin/mklib.solaris" \ "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm -lCrun" sunos5-gcc: @@ -989,7 +986,6 @@ sunos5-smp: "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \ "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \ - "MAKELIB = ../bin/mklib.solaris" \ "APP_LIB_DEPS = -xautopar -xreduction -lX11 -lglut -lGLU -lGL -lm -lCrun -lthread" ultrix-gcc: @@ -1030,7 +1026,6 @@ unixware-shared: "CC = cc" \ "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \ "CXXFLAGS = -O -KPIC,inline" \ - "MAKELIB = $(TOP)/bin/mklib.solaris" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm" # for debugging on IRIX 5.x systems diff --git a/bin/mklib.solaris b/bin/mklib.solaris deleted file mode 100644 index 5a26a355c02..00000000000 --- a/bin/mklib.solaris +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# Make a Solaris shared library -# contributed by Arno Hahma ([email protected]) - -#--identification------------------------------------------------------ - -# $Id: mklib.solaris,v 1.2 1999/09/15 15:10:20 brianp Exp $ - -# $Log: mklib.solaris,v $ -# Revision 1.2 1999/09/15 15:10:20 brianp -# added third, tiny version number to arguments -# -# Revision 1.1 1999/08/19 13:53:06 brianp -# initial check-in (post-crash) -# - - -#--common-------------------------------------------------------------- - -LIBRARY=$1 -shift 1 - -MAJOR=$1 -shift 1 - -MINOR=$1 -shift 1 - -TINY=$1 -shift 1 - -OBJECTS=$* - -#--platform------------------------------------------------------------- - -set -x - -LIBRARY=`basename $LIBRARY .a` - -VERSION=$MAJOR.$MINOR - -echo "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a" -rm -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION} -ar ruv ${LIBRARY}.a ${OBJECTS} - -ld -G -o ${LIBRARY}.so.${VERSION} ${OBJECTS} - -cp ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib -cd ../lib -ln -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so - |