Use ${LDFLAGS} on the "cc -o" line to find the libraries correctly.

This commit is contained in:
simonb 1999-10-04 23:08:00 +00:00
parent 9d5f5ef02f
commit 26a98265fe

View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.2 1998/12/22 18:55:52 frueauf Exp $
$NetBSD: patch-aa,v 1.3 1999/10/04 23:08:00 simonb Exp $
--- Makefile.orig Sun Dec 20 18:56:29 1998
+++ Makefile Tue Dec 22 18:28:07 1998
--- Makefile.orig Mon Dec 21 04:56:29 1998
+++ Makefile Sun Oct 3 14:13:44 1999
@@ -1,10 +1,11 @@
CURRENT_DIR = .
@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.2 1998/12/22 18:55:52 frueauf Exp $
MAKE = make
-LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+CFLAGS+= -I ${X11BASE}/include -I ${LOCALBASE}/include
+LIBS = -L ${LOCALBASE}/lib -L ${X11BASE}/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
+CFLAGS+= -I${X11BASE}/include -I ${LOCALBASE}/include
+LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm
SRCS = \
applic.c \
@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.2 1998/12/22 18:55:52 frueauf Exp $
fi \
done
- cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS)
+ cc -o abs ./TextField-1.0/*.o ${OBJS} ${LIBS}
+ cc -o abs ./TextField-1.0/*.o ${OBJS} ${LDFLAGS} ${LIBS}
clean::
rm -f *.o */*.o */*.a