$NetBSD: patch-aa,v 1.2 2001/09/12 03:06:04 jlam Exp $ --- Makefile.orig Sat Oct 16 06:00:08 1999 +++ Makefile @@ -1,27 +1,43 @@ # MAINVERSION = '"6.03"' GUIVERSION = '".06"' -LIBDIR = '"/usr/local/lib/Ngraph"' -INSTALLDIR = /usr/local/lib/Ngraph -BINDIR = /usr/local/bin +LIBDIR = '"${PREFIX}/libexec/Ngraph"' +INSTALLDIR = ${PREFIX}/libexec/Ngraph +BINDIR = ${PREFIX}/bin # # ############################################################################### # -# Linux + Motif 2.1 (RedHat) [static link] +# NetBSD + lesstif/openmotif [dynamic link] # CC = gcc -CCOPTION = -O2 -m486 -MAKE = make +CCOPTION = ${CFLAGS} AR = ar RANLIB = ranlib STRIP = strip -DEFS = -DJAPANESE -PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' +DEFS = ${MOTIF_DEFS} +PLATFORM = '"for X11 [NetBSD + OpenMotif/LessTif]"' +X11INCLUDE = -I${BUILDLINK_X11_DIR}/include -I../combo +STATICLINK = ./combo/ComboBox.o +X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM +# +# +############################################################################### +# +# Linux + Motif 2.1 (RedHat) [static link] +# +#CC = gcc +#CCOPTION = -O2 -m486 +#MAKE = make +#AR = ar +#RANLIB = ranlib +#STRIP = strip +#DEFS = -DJAPANESE +#PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' #PLATFORM = '"for X11 [Linux(libc5)+Motif2.1]"' -X11INCLUDE = -I/usr/X11R6/include -STATICLINK = /usr/X11R6/lib/libXm.a -X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM +#X11INCLUDE = -I/usr/X11R6/include +#STATICLINK = /usr/X11R6/lib/libXm.a +#X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM # # ############################################################################### @@ -154,6 +170,7 @@ OBJECT = x11/main.o x11/x11.a src/kern.a all: + (cd combo; $(CC) $(CCOPTION) $(X11INCLUDE) -c ComboBox.c) (cd src; $(MAKE) kern.a) (cd x11; $(MAKE) main.o) (cd x11; $(MAKE) x11.a) @@ -196,6 +213,7 @@ - (cd x11; $(MAKE) clean) - (cd x11drive; $(MAKE) clean) - (cd x11addin; $(MAKE) clean) + - (cd combo; rm ComboBox.o) cleanbackup: rm *~ src/*~ x11/*~ x11drive/*~