merge from 6.0.1 branch
This commit is contained in:
parent
257c085db9
commit
52fb07e2b2
|
@ -340,6 +340,7 @@ hpux10:
|
|||
"CXX = aCC" \
|
||||
"CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
|
||||
"CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \
|
||||
"MKLIB_OPTIONS = -static" \
|
||||
"APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup"
|
||||
|
||||
hpux10-sl:
|
||||
|
|
|
@ -290,14 +290,14 @@ case $ARCH in
|
|||
'HP-UX')
|
||||
if [ $STATIC = 1 ] ; then
|
||||
LIBNAME="lib${LIBNAME}.a"
|
||||
echo "mklib: Making HPUX static library: " ${LIBNAME}
|
||||
echo "mklib: Making HP-UX static library: " ${LIBNAME}
|
||||
rm -f ${LIBNAME}
|
||||
ar -ruv ${LIBNAME} ${OBJECTS}
|
||||
FINAL_LIBS=${LIBNAME}
|
||||
else
|
||||
RUNLIB="lib${LIBNAME}.${MAJOR}"
|
||||
DEVLIB="lib${LIBNAME}.sl"
|
||||
echo "mklib: Making HPUX stared library: " ${RUNLIB} ${DEVLIB}
|
||||
echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
|
||||
ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
|
||||
ln -s ${RUNLIB} ${DEVLIB}
|
||||
FINAL_LIBS="{RUNLIB} ${DEVLIB}"
|
||||
|
|
Loading…
Reference in New Issue