summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguenther <>2013-10-14 06:55:28 +0000
committerguenther <>2013-10-14 06:55:28 +0000
commitf11bd858b61eb841060f8a8541da72b668602c81 (patch)
tree20c8c34745a723c840c6e7333b9361ad716b81f8
parent39dc56fb519d0b54bc787d7afcfd03e39cb45eb6 (diff)
downloadopenbsd-f11bd858b61eb841060f8a8541da72b668602c81.tar.gz
openbsd-f11bd858b61eb841060f8a8541da72b668602c81.tar.bz2
openbsd-f11bd858b61eb841060f8a8541da72b668602c81.zip
Missed the file renames for the string functions when committing the
DIST_LIB/DIST_OBJ/*.do changes
-rw-r--r--src/lib/libc/string/Makefile.inc26
1 files changed, 25 insertions, 1 deletions
diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
index 6454a8dfef..05bd93a417 100644
--- a/src/lib/libc/string/Makefile.inc
+++ b/src/lib/libc/string/Makefile.inc
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile.inc,v 1.30 2013/05/13 10:37:02 ajacoutot Exp $ 1# $OpenBSD: Makefile.inc,v 1.31 2013/10/14 06:55:28 guenther Exp $
2 2
3# string sources 3# string sources
4.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string 4.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
@@ -45,6 +45,12 @@ memmove.po: bcopy.c
45memmove.so: bcopy.c 45memmove.so: bcopy.c
46 ${CC} ${PICFLAG} -DPIC -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \ 46 ${CC} ${PICFLAG} -DPIC -DMEMMOVE ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
47 -o ${.TARGET} 47 -o ${.TARGET}
48
49memmove.do: bcopy.c
50 ${CC} -DMEMMOVE ${CFLAGS} ${CPPFLAGS} ${DIST_CFLAGS} -c ${.ALLSRC} \
51 -o ${.TARGET}
52 @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
53 @mv ${.TARGET}.tmp ${.TARGET}
48.endif 54.endif
49 55
50# if no machine specific memcpy(3), build one out of bcopy(3). 56# if no machine specific memcpy(3), build one out of bcopy(3).
@@ -71,6 +77,12 @@ memcpy.po: bcopy.c
71memcpy.so: bcopy.c 77memcpy.so: bcopy.c
72 ${CC} ${PICFLAG} -DPIC -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \ 78 ${CC} ${PICFLAG} -DPIC -DMEMCOPY ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
73 -o ${.TARGET} 79 -o ${.TARGET}
80
81memcpy.do: bcopy.c
82 ${CC} -DMEMCOPY ${CFLAGS} ${CPPFLAGS} ${DIST_CFLAGS} -c ${.ALLSRC} \
83 -o ${.TARGET}
84 @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
85 @mv ${.TARGET}.tmp ${.TARGET}
74.endif 86.endif
75.endif 87.endif
76 88
@@ -95,6 +107,12 @@ strchr.po: index.c
95strchr.so: index.c 107strchr.so: index.c
96 ${CC} ${PICFLAG} -DPIC -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \ 108 ${CC} ${PICFLAG} -DPIC -DSTRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
97 -o ${.TARGET} 109 -o ${.TARGET}
110
111strchr.do: index.c
112 ${CC} -DSTRCHR ${CFLAGS} ${CPPFLAGS} ${DIST_CFLAGS} -c ${.ALLSRC} \
113 -o ${.TARGET}
114 @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
115 @mv ${.TARGET}.tmp ${.TARGET}
98.endif 116.endif
99 117
100# if no machine specific strrchr(3), build one out of rindex(3). 118# if no machine specific strrchr(3), build one out of rindex(3).
@@ -118,6 +136,12 @@ strrchr.po: rindex.c
118strrchr.so: rindex.c 136strrchr.so: rindex.c
119 ${CC} ${PICFLAG} -DPIC -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \ 137 ${CC} ${PICFLAG} -DPIC -DSTRRCHR ${CFLAGS} ${CPPFLAGS} -c ${.ALLSRC} \
120 -o ${.TARGET} 138 -o ${.TARGET}
139
140strrchr.do: rindex.c
141 ${CC} -DSTRRCHR ${CFLAGS} ${CPPFLAGS} ${DIST_CFLAGS} -c ${.ALLSRC} \
142 -o ${.TARGET}
143 @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
144 @mv ${.TARGET}.tmp ${.TARGET}
121.endif 145.endif
122 146
123MAN+= bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 memccpy.3 memchr.3 \ 147MAN+= bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 memccpy.3 memchr.3 \