1997-06-03 07:15:52 +00:00
|
|
|
*** Makefile.config.orig Fri May 30 03:29:08 1997
|
|
|
|
|
--- Makefile.config Fri May 30 03:31:38 1997
|
1996-11-29 20:33:19 +00:00
|
|
|
***************
|
1997-06-03 07:15:52 +00:00
|
|
|
*** 44,50 ****
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# Binaries and man pages will be installed here:
|
|
|
|
|
! PREFIX = /usr/local
|
|
|
|
|
|
|
|
|
|
# SCO puts stuff here:
|
|
|
|
|
#PREFIX = /u
|
|
|
|
|
--- 44,50 ----
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# Binaries and man pages will be installed here:
|
|
|
|
|
! PREFIX ?= /usr/X11R6
|
|
|
|
|
|
|
|
|
|
# SCO puts stuff here:
|
|
|
|
|
#PREFIX = /u
|
|
|
|
|
*************** EXE =
|
|
|
|
|
*** 149,155 ****
|
|
|
|
|
#CFLAGS2 = -O2 -Wall -DNO_XPM
|
1996-11-29 20:33:19 +00:00
|
|
|
|
|
|
|
|
# If you're using g++ 2.7.x, you'll want to use -Wno-unused:
|
1997-06-03 07:15:52 +00:00
|
|
|
! CFLAGS2 = -O2 -Wall -Wno-unused -DNO_XPM
|
1996-11-29 20:33:19 +00:00
|
|
|
|
|
|
|
|
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
|
|
|
|
|
#CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
|
1997-06-03 07:15:52 +00:00
|
|
|
--- 149,155 ----
|
|
|
|
|
#CFLAGS2 = -O2 -Wall -DNO_XPM
|
1996-11-29 20:33:19 +00:00
|
|
|
|
|
|
|
|
# If you're using g++ 2.7.x, you'll want to use -Wno-unused:
|
1997-06-03 07:15:52 +00:00
|
|
|
! CFLAGS2 = -O2 -m486 -pipe -Wall -Wno-unused -I${X11BASE}/include
|
1996-11-29 20:33:19 +00:00
|
|
|
|
|
|
|
|
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
|
|
|
|
|
#CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
|
1997-06-03 07:15:52 +00:00
|
|
|
*************** CXXFLAGS2 = $(CFLAGS2)
|
|
|
|
|
*** 197,209 ****
|
1996-11-29 20:33:19 +00:00
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# For most systems, just grab the X library:
|
|
|
|
|
! XLIBS = -lX11
|
|
|
|
|
|
|
|
|
|
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
|
|
|
|
|
#XLIBS = -L/usr/X11R6/lib -lX11
|
|
|
|
|
|
|
|
|
|
# For official FreeBSD port (using the FreeBSD makefiles):
|
|
|
|
|
! #XLIBS = -L$(X11BASE)/lib -lX11
|
|
|
|
|
|
|
|
|
|
# Some BSDI systems may need -lipc (?):
|
|
|
|
|
#XLIBS = -L/usr/X11R6/lib -lX11 -lipc
|
1997-06-03 07:15:52 +00:00
|
|
|
--- 197,209 ----
|
1996-11-29 20:33:19 +00:00
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# For most systems, just grab the X library:
|
|
|
|
|
! #XLIBS = -lX11
|
|
|
|
|
|
|
|
|
|
# For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
|
|
|
|
|
#XLIBS = -L/usr/X11R6/lib -lX11
|
|
|
|
|
|
|
|
|
|
# For official FreeBSD port (using the FreeBSD makefiles):
|
|
|
|
|
! XLIBS = -L$(X11BASE)/lib -lX11
|
|
|
|
|
|
|
|
|
|
# Some BSDI systems may need -lipc (?):
|
|
|
|
|
#XLIBS = -L/usr/X11R6/lib -lX11 -lipc
|
1997-06-03 07:15:52 +00:00
|
|
|
*************** XLIBS = -lX11
|
|
|
|
|
*** 242,251 ****
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# This is needed for the color icon:
|
|
|
|
|
! #XPMLIB = -lXpm
|
|
|
|
|
|
|
|
|
|
# Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
|
|
|
|
|
! XPMLIB =
|
|
|
|
|
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
# C++ compilation rule.
|
|
|
|
|
--- 242,251 ----
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# This is needed for the color icon:
|
|
|
|
|
! XPMLIB = -lXpm
|
|
|
|
|
|
|
|
|
|
# Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2):
|
|
|
|
|
! #XPMLIB =
|
|
|
|
|
|
|
|
|
|
#------------------------------------------------------------------------
|
|
|
|
|
# C++ compilation rule.
|
