Put in proper address information for Poul-Henning Kamp.

[unix-history] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 6d34781..29043c1 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,10 +1,18 @@
 #      @(#)Makefile    5.25.1.1 (Berkeley) 5/7/91
 
 #      @(#)Makefile    5.25.1.1 (Berkeley) 5/7/91
 

-<<<<<<< 1.3.2.1
-SUBDIR=        csu.${MACHINE} libc libcurses libm \
-=======
-SUBDIR=        csu.${MACHINE} libc libcurses libg++ libm \
->>>>>>> /tmp/T4016752
-       libresolv librpc libtelnet libterm libutil liby
+SUBDIR=        csu.${MACHINE} libc libcurses libm libpthread \
+       libresolv librpcsvc libtelnet libterm libutil liby
+
+.if exists(libcrypt)
+.if !defined(NOCRYPT)
+SUBDIR+= libcrypt
+.endif
+.endif
+
+.if !defined(SPLIT_F2C)
+SUBDIR+= libf2c
+.else
+SUBDIR+= libI77 libF77
+.endif

 
 .include <bsd.subdir.mk>
 
 .include <bsd.subdir.mk>