diff options
Diffstat (limited to 'editors/sam/files/patch-aa')
| -rw-r--r-- | editors/sam/files/patch-aa | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/editors/sam/files/patch-aa b/editors/sam/files/patch-aa index 6b5c32ede1dc..63af3ca481bd 100644 --- a/editors/sam/files/patch-aa +++ b/editors/sam/files/patch-aa @@ -1,15 +1,8 @@ -*** libXg/Makefile.orig Fri Jul 28 14:02:17 1995 ---- libXg/Makefile Fri Jul 21 15:03:43 1995 +*** libXg/Makefile.orig Fri Feb 11 11:04:17 2000 +--- libXg/Makefile Fri Feb 11 11:07:47 2000 *************** -*** 1,24 **** - # Copyright (c) 1992 AT&T - All rights reserved. - # -! # Prototype Makefile for libXg - # -- # define operating system. ONE of: -- # -DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1 -- # -DHPUX -DAPOLLO -DCONVEX -DDYNIX -- # +*** 8,24 **** + # # Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified # if your compiler supports posix-compatible compilation ! OS=-DIRIX -ansiposix @@ -26,24 +19,18 @@ # add name of librarian AR=ar ---- 1,23 ---- - # Copyright (c) 1992 AT&T - All rights reserved. - # -! # Prototype BSDi Makefile for libXg -! # Courtesy of Boyd Roberts -! # -! # Define operating system type: -DBSDi - # +--- 8,24 ---- + # # Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified # if your compiler supports posix-compatible compilation -! OS=-O2 -DBSDi +! OS=-DBSDi # add -Iincludedir for any include directories that need to be searched -! INCS=-I../include -I/usr/X11R6/include +! INCS=-I../include -I${X11BASE}/include # set this if your X libraries are in different locations # or if you need extra libraries to load with X11 applications -! XLIBS=/usr/X11/lib/libXt.a /usr/X11/lib/libX11.a +! XLIBS=-lXt -lX11 -L${X11BASE}/lib # add name of library orderer - use ":" if none ! RANLIB=ranlib @@ -51,6 +38,25 @@ # add name of librarian AR=ar *************** +*** 26,33 **** + # the name of the library + LIB=libXg.a + +! CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS) +! CC=cc + + OBJS= arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect.o\ + circle.o clipline.o clipr.o copymasked.o cursorset.o cursorswitch.o\ +--- 26,33 ---- + # the name of the library + LIB=libXg.a + +! CFLAGS+=$(OS) -D_LIBXG_EXTENSION $(INCS) +! CC?=cc + + OBJS= arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect.o\ + circle.o clipline.o clipr.o copymasked.o cursorset.o cursorswitch.o\ +*************** *** 50,56 **** $(LIB): $(OBJS) $(AR) rv $(LIB) $(OBJS) @@ -59,4 +65,4 @@ - $(LIB)(%.o): %.o $(OBJS): ../include/libg.h libgint.h ../include/libc.h ---- 49,53 ---- +--- 50,54 ---- |