Changeset 3698
- Timestamp:
- Mar 16, 2011, 5:18:06 PM (14 years ago)
- Location:
- trunk/libc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libc/Makefile.kmk
r3650 r3698 54 54 libc_frontend_TEMPLATE = libc 55 55 libc_frontend_SOURCES = \ 56 $( TARGET_libc_libc) \57 $( TARGET_libc_fbsdlibc) \58 $( TARGET_libc_glibc) \59 $( TARGET_libc_msun)56 $(libc_libc_1_TARGET) \ 57 $(libc_fbsdlibc_1_TARGET) \ 58 $(libc_glibc_1_TARGET) \ 59 $(libc_msun_1_TARGET) 60 60 #libc_SOURCES.os2 = \ 61 # $( TARGET_libc_libsocket) \62 # $( TARGET_libc_libsyslog)63 libc_SOURCES.nt = $( TARGET_kNIX.nt)61 # $(libc_libsocket_1_TARGET) \ 62 # $(libc_libsyslog_1_TARGET) 63 libc_SOURCES.nt = $(kNIX.nt_1_TARGET) 64 64 65 65 ifdef CFG_LIBC_LOGSTRICT_LIBS … … 67 67 libc_frontend_l_TEMPLATE = libc.logstrict 68 68 libc_frontend_l_SOURCES = \ 69 $( TARGET_libc_libc_l) \70 $( TARGET_libc_fbsdlibc_l) \71 $( TARGET_libc_glibc_l) \72 $( TARGET_libc_msun_l)69 $(libc_libc_l_1_TARGET) \ 70 $(libc_fbsdlibc_l_1_TARGET) \ 71 $(libc_glibc_l_1_TARGET) \ 72 $(libc_msun_l_1_TARGET) 73 73 #libc_frontend_l_SOURCES.os2 = \ 74 # $( TARGET_libc_libsocket_l) \75 # $( TARGET_libc_libsyslog_l)74 # $(libc_libsocket_l_1_TARGET) \ 75 # $(libc_libsyslog_l_1_TARGET) 76 76 endif 77 77 … … 80 80 libc_frontend_p_TEMPLATE = libc.profiled 81 81 libc_frontend_p_SOURCES = \ 82 $( TARGET_libc_libc_p) \83 $( TARGET_libc_fbsdlibc_p) \84 $( TARGET_libc_glibc_p) \85 $( TARGET_libc_msun_p)82 $(libc_libc_p_1_TARGET) \ 83 $(libc_fbsdlibc_p_1_TARGET) \ 84 $(libc_glibc_p_1_TARGET) \ 85 $(libc_msun_p_1_TARGET) 86 86 #libc_frontend_p_SOURCES.os2 = \ 87 # $( TARGET_libc_libsocket_p) \88 # $( TARGET_libc_libsyslog_p)87 # $(libc_libsocket_p_1_TARGET) \ 88 # $(libc_libsyslog_p_1_TARGET) 89 89 endif 90 90 … … 96 96 libc_frontend_asm_TEMPLATE = libcasm 97 97 libc_frontend_asm_SOURCES = \ 98 $( TARGET_libc_libc_asm) \99 $( TARGET_libc_fbsdlibc_asm) \100 $( TARGET_libc_glibc_asm) \101 $( TARGET_libc_msun_asm)98 $(libc_libc_asm_1_TARGET) \ 99 $(libc_fbsdlibc_asm_1_TARGET) \ 100 $(libc_glibc_asm_1_TARGET) \ 101 $(libc_msun_asm_1_TARGET) 102 102 103 103 ifdef CFG_LIBC_LOGSTRICT_LIBS … … 105 105 libc_frontend_asm_l_TEMPLATE = libcasm.logstrict 106 106 libc_frontend_asm_l_SOURCES = \ 107 $( TARGET_libc_libc_asm_l) \108 $( TARGET_libc_fbsdlibc_asm_l) \109 $( TARGET_libc_glibc_asm_l) \110 $( TARGET_libc_msun_asm_l)107 $(libc_libc_asm_l_1_TARGET) \ 108 $(libc_fbsdlibc_asm_l_1_TARGET) \ 109 $(libc_glibc_asm_l_1_TARGET) \ 110 $(libc_msun_asm_l_1_TARGET) 111 111 endif 112 112 … … 115 115 libc_frontend_asm_p_TEMPLATE = libcasm.profiled 116 116 libc_frontend_asm_p_SOURCES = \ 117 $( TARGET_libc_libc_asm_p) \118 $( TARGET_libc_fbsdlibc_asm_p) \119 $( TARGET_libc_glibc_asm_p) \120 $( TARGET_libc_msun_asm_p)117 $(libc_libc_asm_p_1_TARGET) \ 118 $(libc_fbsdlibc_asm_p_1_TARGET) \ 119 $(libc_glibc_asm_p_1_TARGET) \ 120 $(libc_msun_asm_p_1_TARGET) 121 121 endif 122 122 … … 128 128 libc_s_TEMPLATE = libc 129 129 libc_s_SOURCES = \ 130 $( TARGET_libc_frontend) \131 $( TARGET_libc_kNIX)132 libc_s_SOURCES.nt = $( TARGET_kNIX.nt)130 $(libc_frontend_1_TARGET) \ 131 $(libc_kNIX_1_TARGET) 132 libc_s_SOURCES.nt = $(kNIX.nt_1_TARGET) 133 133 134 134 ifdef CFG_LIBC_LOGSTRICT_LIBS … … 136 136 libc_s_l_TEMPLATE = libc.profiled 137 137 libc_s_l_SOURCES = \ 138 $( TARGET_libc_frontend_l) \139 $( TARGET_libc_kNIX_l)140 libc_s_l_SOURCES.nt = $( TARGET_kNIX_l.nt)138 $(libc_frontend_l_1_TARGET) \ 139 $(libc_kNIX_l_1_TARGET) 140 libc_s_l_SOURCES.nt = $(kNIX_l.nt_1_TARGET) 141 141 endif 142 142 … … 145 145 libc_s_p_TEMPLATE = libc.profiled 146 146 libc_s_p_SOURCES = \ 147 $( TARGET_libc_frontend_p) \148 $( TARGET_libc_kNIX_p)149 libc_s_p_SOURCES.nt = $( TARGET_kNIX_p.nt)147 $(libc_frontend_p_1_TARGET) \ 148 $(libc_kNIX_p_1_TARGET) 149 libc_s_p_SOURCES.nt = $(kNIX_p.nt_1_TARGET) 150 150 endif 151 151 … … 157 157 libc_asm_TEMPLATE = libcasm 158 158 libc_asm_SOURCES = \ 159 $( TARGET_libc_frontend_asm) \160 $( TARGET_libc_kNIX_asm)159 $(libc_frontend_asm_1_TARGET) \ 160 $(libc_kNIX_asm_1_TARGET) 161 161 162 162 ifdef CFG_LIBC_LOGSTRICT_LIBS … … 164 164 libc_asm_l_TEMPLATE = libcasm.logstrict 165 165 libc_asm_l_SOURCES = \ 166 $( TARGET_libc_frontend_asm_l) \167 $( TARGET_libc_kNIX_asm_l)166 $(libc_frontend_asm_l_1_TARGET) \ 167 $(libc_kNIX_asm_l_1_TARGET) 168 168 endif 169 169 … … 172 172 libc_asm_p_TEMPLATE = libcasm.profiled 173 173 libc_asm_p_SOURCES = \ 174 $( TARGET_libc_frontend_asm_p) \175 $( TARGET_libc_kNIX_asm_p)174 $(libc_frontend_asm_p_1_TARGET) \ 175 $(libc_kNIX_asm_p_1_TARGET) 176 176 endif 177 177 … … 189 189 libc07_LDFLAGS = -g -Zomf -nostdlib 190 190 libc07_LIBS = \ 191 $( TARGET_libc_s) \192 $( TARGET_libc_asm) \193 $( TARGET_libos2_unicode_lazy) \194 $( TARGET_libos2) \191 $(libc_s_1_TARGET) \ 192 $(libc_asm_1_TARGET) \ 193 $(libos2_unicode_lazy_1_TARGET) \ 194 $(libos2_1_TARGET) \ 195 195 $(PATH_TARGET)/libc_alias/libc_alias.a \ 196 196 gcc \ … … 209 209 libc07.logstrict_LDFLAGS = -g -Zomf -nostdlib 210 210 libc07.logstrict_LIBS = \ 211 $( TARGET_libc_s_l) \212 $( TARGET_libc_asm_l) \213 $( TARGET_libos2_unicode_lazy) \214 $( TARGET_libos2_l) \211 $(libc_s_l_1_TARGET) \ 212 $(libc_asm_l_1_TARGET) \ 213 $(libos2_unicode_lazy_1_TARGET) \ 214 $(libos2_l_1_TARGET) \ 215 215 $(PATH_TARGET)/libc_alias/libc_alias.a \ 216 216 gcc \ … … 230 230 libc07.profiled_LDFLAGS = -g -Zomf -nostdlib 231 231 libc07.profiled_LIBS = \ 232 $( TARGET_libc_s_p) \233 $( TARGET_libc_asm_p) \234 $( TARGET_libos2_unicode_lazy) \235 $( TARGET_libos2_p) \232 $(libc_s_p_1_TARGET) \ 233 $(libc_asm_p_1_TARGET) \ 234 $(libos2_unicode_lazy_1_TARGET) \ 235 $(libos2_p_1_TARGET) \ 236 236 $(PATH_TARGET)/libc_alias/libc_alias.a \ 237 237 gcc \ … … 260 260 # 261 261 $(PATH_TARGET)/libc.def: \ 262 $$( TARGET_libc_s) \262 $$(libc_s_1_TARGET) \ 263 263 $$(PATH_LIBC_SRC)/libc/libc.def 264 264 $(RM) -f $@ $@.tmp.def … … 268 268 $(APPEND) $@.tmp.def "CODE SHARED" 269 269 $(APPEND) $@.tmp.def "EXPORTS" 270 emxexp $( TARGET_libc_s) \270 emxexp $(libc_s_1_TARGET) \ 271 271 | $(SED) -e "/\"___pfn/d" -e "/\"__sys_/d" -e "/\"___sys_/d" -e "/\"___libc_[a-z]/d" -e "/\"__nsyy/d" \ 272 272 >> $@.tmp.def -
trunk/libc/src/fbsdlibc/Makefile.kmk
r2901 r3698 44 44 libc_fbsdlibc_TEMPLATE = libcsub 45 45 libc_fbsdlibc_SOURCES := \ 46 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $( PATH_$(sublib))/$(sublib).a)46 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $($(sublib)_0_OUTDIR)/$(sublib).a) 47 47 ifdef CFG_LIBC_LOGSTRICT_LIBS 48 48 LIBRARIES += libc_fbsdlibc_l 49 49 libc_fbsdlibc_l_TEMPLATE = libcsub 50 50 libc_fbsdlibc_l_SOURCES := \ 51 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $( PATH_$(sublib)_l)/$(sublib)_l.a)51 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $($(sublib)_l_0_OUTDIR)/$(sublib)_l.a) 52 52 endif 53 53 ifdef CFG_LIBC_PROFILED_LIBS … … 55 55 libc_fbsdlibc_p_TEMPLATE = libcsub 56 56 libc_fbsdlibc_p_SOURCES := \ 57 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $( PATH_$(sublib)_p)/$(sublib)_p.a)57 $(foreach sublib,$(LIBC_SUB_LIBRARIES), $($(sublib)_p_0_OUTDIR)/$(sublib)_p.a) 58 58 endif 59 59 -
trunk/libc/src/fbsdlibc/gdtoa/Makefile.kmk
r3649 r3698 34 34 libc_fbsdlibc_gdtoa_TEMPLATE = libcsub 35 35 libc_fbsdlibc_gdtoa_INCS = $(PATH_LIBC_SRC)/fbsdlibc/include $(PATH_TARGET) 36 libc_fbsdlibc_gdtoa_DEPS = $( TARGET_arithchk) $(PATH_TARGET)/arith.h36 libc_fbsdlibc_gdtoa_DEPS = $(arithchk_1_TARGET) $(PATH_TARGET)/arith.h 37 37 libc_fbsdlibc_gdtoa_SOURCES = \ 38 38 $(PATH_LIBC_SRC)/fbsdlibc/gdtoa/dmisc.c \ … … 92 92 93 93 # generate arith.h 94 $(PATH_TARGET)/arith.h: $$( TARGET_arithchk)94 $(PATH_TARGET)/arith.h: $$(arithchk_1_TARGET) 95 95 $(TEST) -n $< -a -f $< 96 96 $< > $@.tmp -
trunk/libc/src/libc/conv/Makefile.kmk
r3649 r3698 90 90 91 91 # Generate the big integer tables. 92 $(PATH_TARGET)/bipow5.tab: $$( TARGET_makepow5) | $(call DIRDEP,$(PATH_TARGET))92 $(PATH_TARGET)/bipow5.tab: $$(makepow5_1_TARGET) | $(call DIRDEP,$(PATH_TARGET)) 93 93 $< -o $@ -s -m325 4951 94 94
Note:
See TracChangeset
for help on using the changeset viewer.