Fri Jan 7 18:25:21 2011 UTC ()
Clean up for ticket #1499 - doubled content, not sure how it happened.


(riz)
diff -r1.5.2.2 -r1.5.2.3 src/compat/compatsubdir.mk
cvs diff -r1.5.2.2 -r1.5.2.3 src/compat/compatsubdir.mk (expand / switch to unified diff)

--- src/compat/compatsubdir.mk 2011/01/06 05:19:55 1.5.2.2
+++ src/compat/compatsubdir.mk 2011/01/07 18:25:21 1.5.2.3
@@ -1,52 +1,14 @@ @@ -1,52 +1,14 @@
1# $NetBSD: compatsubdir.mk,v 1.5.2.2 2011/01/06 05:19:55 riz Exp $ 1# $NetBSD: compatsubdir.mk,v 1.5.2.3 2011/01/07 18:25:21 riz Exp $
2 
3# Build netbsd libraries. 
4 
5.include <bsd.own.mk> 
6 
7.if ${MKCOMPAT} != "no" 
8.if !make(includes) 
9 
10# make sure we get an objdir built early enough 
11.include <bsd.prog.mk> 
12 
13# XXX make this use MAKEOBJDIR 
14MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} 
15 
16# XXX fix the "library" list to include all 'external' libs? 
17.if defined(BOOTSTRAP_SUBDIRS) 
18SUBDIR= ${BOOTSTRAP_SUBDIRS} 
19.else 
20SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \ 
21 ../../../lib/csu .WAIT \ 
22 ../../../gnu/lib/libgcc4 .WAIT \ 
23 ../../../lib/libc .WAIT \ 
24 ../../../lib/libutil .WAIT \ 
25 ../../../lib .WAIT \ 
26 ../../../gnu/lib \ 
27 ../../../libexec/ld.elf_so 
28 
29.if (${MKLDAP} != "no") 
30SUBDIR+= ../../../external/bsd/openldap/lib 
31.endif 
32 
33.endif 
34 
35.include <bsd.subdir.mk> 
36 
37.endif 
38.endif 
39# $NetBSD: compatsubdir.mk,v 1.5.2.2 2011/01/06 05:19:55 riz Exp $ 
40 2
41# Build netbsd libraries. 3# Build netbsd libraries.
42 4
43.include <bsd.own.mk> 5.include <bsd.own.mk>
44 6
45.if ${MKCOMPAT} != "no" 7.if ${MKCOMPAT} != "no"
46.if !make(includes) 8.if !make(includes)
47 9
48# make sure we get an objdir built early enough 10# make sure we get an objdir built early enough
49.include <bsd.prog.mk> 11.include <bsd.prog.mk>
50 12
51# XXX make this use MAKEOBJDIR 13# XXX make this use MAKEOBJDIR
52MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} 14MAKEDIRTARGETENV= MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}