-SUBDIR= libc libcurses libcompat libdbm libm libmp libplot \
- libresolv librpc/rpc libterm libutil liby
-
-.if ${MACHINE} == "tahoe"
-SUBDIR+=csu libF77 libI77 libU77
-.elif ${MACHINE} == "vax"
-SUBDIR+=csu libF77 libI77 libU77
-.endif
+SUBDIR= csu.${MACHINE} libc libcurses libg++ libm \
+ libresolv librpc/rpc libtelnet libterm libutil liby