Module Name: src
Committed By: martin
Date: Fri Jan 2 20:41:51 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libGLU [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #370):
external/mit/xorg/lib/libGLU/Makefile: revision 1.16
switch over to the separate glu sources.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 src/external/mit/xorg/lib/libGLU/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.15 src/external/mit/xorg/lib/libGLU/Makefile:1.15.2.1
--- src/external/mit/xorg/lib/libGLU/Makefile:1.15 Mon Jul 14 00:22:46 2014
+++ src/external/mit/xorg/lib/libGLU/Makefile Fri Jan 2 20:41:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/07/14 00:22:46 riz Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2015/01/02 20:41:51 martin Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -7,67 +7,127 @@ NOLINT= 1 # XTODO: tess.ln SIGSEGVs lin
LIB= GLU
LIBISCXX= yes
-GLUDIR= ${X11SRCDIR.MesaLib}/src/glu/sgi
+GLUDIR= ${X11SRCDIR.glu}/src
-SRCS.libutil= error.c glue.c mipmap.c project.c quad.c registry.c
+SRCS.libutil= \
+ error.c \
+ glue.c \
+ mipmap.c \
+ project.c \
+ quad.c \
+ registry.c
.PATH: ${GLUDIR}/libutil
-SRCS.libtess= dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \
- render.c sweep.c tess.c tessmono.c
+SRCS.libtess= \
+ dict.c \
+ geom.c \
+ memalloc.c \
+ mesh.c \
+ normal.c \
+ priorityq.c \
+ render.c \
+ sweep.c \
+ tess.c \
+ tessmono.c
.PATH: ${GLUDIR}/libtess
-SRCS.interface= bezierEval.cc bezierPatch.cc bezierPatchMesh.cc \
- glcurveval.cc glinterface.cc glrenderer.cc \
- glsurfeval.cc incurveeval.cc insurfeval.cc
+SRCS.interface= \
+ bezierEval.cc \
+ bezierPatch.cc \
+ bezierPatchMesh.cc \
+ glcurveval.cc \
+ glinterface.cc \
+ glrenderer.cc \
+ glsurfeval.cc \
+ incurveeval.cc \
+ insurfeval.cc
.PATH: ${GLUDIR}/libnurbs/interface
-.for fn in ${SRCS.interface}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -DLIBRARYBUILD
-.endfor
-SRCS.internals= arc.cc arcsorter.cc arctess.cc backend.cc \
- basiccrveval.cc basicsurfeval.cc bin.cc bufpool.cc \
- cachingeval.cc ccw.cc coveandtiler.cc curve.cc \
- curvelist.cc curvesub.cc dataTransform.cc displaylist.cc \
- flist.cc flistsorter.cc hull.cc intersect.cc \
- knotvector.cc mapdesc.cc mapdescv.cc maplist.cc \
- mesher.cc monoTriangulationBackend.cc monotonizer.cc \
- mycode.cc nurbsinterfac.cc nurbstess.cc patch.cc \
- patchlist.cc quilt.cc reader.cc renderhints.cc \
- slicer.cc sorter.cc splitarcs.cc subdivider.cc \
- tobezier.cc trimline.cc trimregion.cc trimvertpool.cc \
- uarray.cc varray.cc
+SRCS.internals= \
+ arc.cc \
+ arcsorter.cc \
+ arctess.cc \
+ backend.cc \
+ basiccrveval.cc \
+ basicsurfeval.cc \
+ bin.cc \
+ bufpool.cc \
+ cachingeval.cc \
+ ccw.cc \
+ coveandtiler.cc \
+ curve.cc \
+ curvelist.cc \
+ curvesub.cc \
+ dataTransform.cc \
+ displaylist.cc \
+ flist.cc \
+ flistsorter.cc \
+ hull.cc \
+ intersect.cc \
+ knotvector.cc \
+ mapdesc.cc \
+ mapdescv.cc \
+ maplist.cc \
+ mesher.cc \
+ monoTriangulationBackend.cc \
+ monotonizer.cc \
+ mycode.cc \
+ nurbsinterfac.cc \
+ nurbstess.cc \
+ patch.cc \
+ patchlist.cc \
+ quilt.cc \
+ reader.cc \
+ renderhints.cc \
+ slicer.cc \
+ sorter.cc \
+ splitarcs.cc \
+ subdivider.cc \
+ tobezier.cc \
+ trimline.cc \
+ trimregion.cc \
+ trimvertpool.cc \
+ uarray.cc \
+ varray.cc
.PATH: ${GLUDIR}/libnurbs/internals
.for fn in ${SRCS.internals}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -I${GLUDIR}/libutil \
- -DLIBRARYBUILD -D_EXTENSIONS_
+CPPFLAGS.${fn}+= -D_EXTENSIONS_
.endfor
-SRCS.nurbtess= directedLine.cc gridWrap.cc monoChain.cc monoPolyPart.cc \
- monoTriangulation.cc partitionX.cc partitionY.cc \
- polyDBG.cc polyUtil.cc primitiveStream.cc quicksort.cc \
- rectBlock.cc sampleComp.cc sampleCompBot.cc \
- sampleCompRight.cc sampleCompTop.cc sampleMonoPoly.cc \
- sampledLine.cc searchTree.cc
+SRCS.nurbtess= \
+ directedLine.cc \
+ gridWrap.cc \
+ monoChain.cc \
+ monoPolyPart.cc \
+ monoTriangulation.cc \
+ partitionX.cc \
+ partitionY.cc \
+ polyDBG.cc \
+ polyUtil.cc \
+ primitiveStream.cc \
+ quicksort.cc \
+ rectBlock.cc \
+ sampleComp.cc \
+ sampleCompBot.cc \
+ sampleCompRight.cc \
+ sampleCompTop.cc \
+ sampleMonoPoly.cc \
+ sampledLine.cc \
+ searchTree.cc
.PATH: ${GLUDIR}/libnurbs/nurbtess
-.for fn in ${SRCS.nurbtess}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -DLIBRARYBUILD
-.endfor
-CPPFLAGS+= -I${GLUDIR}/include
CPPFLAGS+= -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
+CPPFLAGS+= -I${GLUDIR}/include \
+ -I${GLUDIR}/libnurbs/internals \
+ -I${GLUDIR}/libnurbs/interface \
+ -I${GLUDIR}/libnurbs/nurbtess
SRCS= ${SRCS.libutil} ${SRCS.libtess} \
${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread
-.PATH: ${X11SRCDIR.MesaLib}/include/GL
+.PATH: ${X11SRCDIR.glu}/include/GL
INCS= glu.h glu_mangle.h
INCSDIR=${X11INCDIR}/GL
@@ -81,9 +141,11 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
m ${NETBSDSRCDIR}/lib/libm
PKGCONFIG= glu
-PKGDIST.glu= ${X11SRCDIR.MesaLib}/src/glu
+PKGDIST.glu= ${X11SRCDIR.glu}
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.glu= ${MESA_VER}
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@GLU_REQUIRES@,gl,"
.include <bsd.x11.mk>
.include <bsd.lib.mk>
