127 lines
3.6 KiB
Text
127 lines
3.6 KiB
Text
$NetBSD: patch-aa,v 1.5 2006/04/19 19:21:28 wiz Exp $
|
|
|
|
--- Makefile.orig 2001-02-01 14:27:30.000000000 +0100
|
|
+++ Makefile
|
|
@@ -45,13 +45,13 @@ CC = cc
|
|
# GCC : Linux Intel optimised
|
|
#prereleaseflags = -Wall -pipe -O2 -g -march=pentium -mcpu=pentium
|
|
# GCC : Linux, FreeBSD, NetBSD compiler flags (recommended)
|
|
-#prereleaseflags = -Wall -g
|
|
+prereleaseflags = -Wall -Wno-comment -Wno-parentheses -O2 -g
|
|
# Qnx
|
|
#prereleaseflags = -Oeax
|
|
# SGI Mipspro
|
|
#prereleaseflags = -g -n32 -Xcpluscomm -woff 1009,1014,1048,1110,1116,1185,1188,1204,1230,1233
|
|
# Sun Workshop C Compiler
|
|
-prereleaseflags = -v -g -xstrconst
|
|
+#prereleaseflags = -v -g -xstrconst
|
|
# Sun Workshop C++ Compiler
|
|
#prereleaseflags = +w -g
|
|
|
|
@@ -63,9 +63,9 @@ prereleaseflags = -v -g -xstrconst
|
|
##
|
|
|
|
# Linux, NetBSD, FreeBSD, BSDI, OSF1, SunOS4this
|
|
-#RANLIB = ranlib
|
|
+RANLIB = ranlib
|
|
# SVR4, Irix, AIX, Qnx, Solaris 2.x
|
|
-RANLIB = /bin/true
|
|
+#RANLIB = /bin/true
|
|
|
|
##
|
|
## System configuration flags
|
|
@@ -92,7 +92,7 @@ RANLIB = /bin/true
|
|
# Irix
|
|
#sysconfigflags = -DSVR4 -DIRIX
|
|
# Solaris2.5 & 2.5.1
|
|
-sysconfigflags = -DSOLARIS -DSVR4
|
|
+#sysconfigflags = -DSOLARIS -DSVR4
|
|
|
|
# Use Motif 1.2.x
|
|
sysconfigflags += -DMOTIF1_2
|
|
@@ -124,7 +124,7 @@ sysconfigflags += -DMOTIF1_2
|
|
# Irix
|
|
#syslibs = -lPW
|
|
# Solaris 2.x, Motorola SVR4
|
|
-syslibs = -lsocket -lnsl -ldl
|
|
+#syslibs = -lsocket -lnsl -ldl
|
|
|
|
##
|
|
## X11 includes
|
|
@@ -141,7 +141,8 @@ syslibs = -lsocket -lnsl -ldl
|
|
# Solaris 2.x
|
|
#xinc = -I/usr/openwin/include -I/usr/dt/include
|
|
#solaris8
|
|
-xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
|
|
+#xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
|
|
+xinc = -I${LOCALBASE}/include -I${X11BASE}/include
|
|
|
|
|
|
##
|
|
@@ -168,9 +169,12 @@ xinc = -I/usr/openwin/include -I/usr/dt/
|
|
# Irix
|
|
#xlibs = -L/usr/lib32 -lXm -lXmu -lXt -lXext -lX11 -lm
|
|
# Solaris 2.x
|
|
-xlibs = -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
|
|
+#xlibs = -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
|
|
#xlibs += -lXm -lXmu -lXt -lXext -lX11 -lm
|
|
-xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm
|
|
+#xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm
|
|
+xlibs = -L${X11BASE}/lib -L${LOCALBASE}/lib
|
|
+xlibs += -lXm -lXmu -lXt -lXext -lX11 -lm
|
|
+xlibs += -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
|
|
|
|
#
|
|
# private
|
|
@@ -190,8 +194,10 @@ xlibs += -lXm12 -lXmu -lXt -lXext -lX11
|
|
#pnginc = /usr/local/include
|
|
#pnglibs = /usr/local/lib/libpng.a /usr/lib/libz.a
|
|
# Solaris
|
|
-pnginc = /usr/local/include
|
|
-pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
|
|
+#pnginc = /usr/local/include
|
|
+#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
|
|
+pnginc = ${LOCALBASE}/include
|
|
+pnglibs = `libpng-config --ldflags`
|
|
|
|
# To disable PNG support comment this.
|
|
|
|
@@ -208,8 +214,10 @@ pngflags = -I$(pnginc) -DHAVE_PNG
|
|
#jpeginc = /usr/include
|
|
#jpeglibs = /usr/lib32/libjpeg.so
|
|
# Solaris FreeBSD
|
|
-jpeginc = /usr/local/include
|
|
-jpeglibs = /usr/local/lib/libjpeg.a
|
|
+#jpeginc = /usr/local/include
|
|
+#jpeglibs = /usr/local/lib/libjpeg.a
|
|
+jpeginc = ${LOCALBASE}/include
|
|
+jpeglibs = -ljpeg -Wl,-R${LOCALBASE}/lib
|
|
|
|
# To disable JPEG support (not recommended) comment this.
|
|
|
|
@@ -259,12 +267,12 @@ PLUGINC = -I$(PLUGINCDIR)
|
|
INSTALL_PLUG_DIR = /usr/local/mMosaic/plugins
|
|
explugdir = $(PWD)/plugins/examples
|
|
# for gcc
|
|
-#explugccflag = -fpic
|
|
-#explugldflag = -shared
|
|
+explugccflag = -fpic
|
|
+explugldflag = -shared
|
|
#
|
|
# for Solaris cc workshop
|
|
-explugccflag = -I$(plugdir) -KPIC
|
|
-explugldflag = -G
|
|
+#explugccflag = -I$(plugdir) -KPIC
|
|
+#explugldflag = -G
|
|
|
|
##
|
|
## Customization flags
|
|
@@ -290,7 +298,7 @@ explugldflag = -G
|
|
#
|
|
# Common
|
|
|
|
-customflags =
|
|
+#customflags = -DIPV6
|
|
|
|
##
|
|
## ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
|