Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 69ba1f9

Browse files
wilzbachdlang-bot
wilzbach
authored and
dlang-bot
committed
Unify Makefile variables for dlang.org: Rename DOCDIR -> DOC_OUTPUT_DIR, DOCFMT -> STDDOC
1 parent 7026e18 commit 69ba1f9

File tree

1 file changed

+62
-61
lines changed

1 file changed

+62
-61
lines changed

‎posix.mak

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ endif
2828
DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
2929
INSTALL_DIR=../install
3030

31-
DOCDIR=doc
31+
# directory where the html files for the documentation are placed
32+
DOC_OUTPUT_DIR=doc
3233
IMPDIR=import
3334

3435
OPTIONAL_COVERAGE:=$(if $(TEST_COVERAGE),-cov=ctfe,)
@@ -104,7 +105,7 @@ DRUNTIMESO=$(ROOT)/libdruntime.so
104105
DRUNTIMESOOBJ=$(ROOT)/libdruntime.so.o
105106
DRUNTIMESOLIB=$(ROOT)/libdruntime.so.a
106107

107-
DOCFMT=
108+
STDDOC=
108109

109110
include mak/COPY
110111
COPY:=$(subst \,/,$(COPY))
@@ -140,178 +141,178 @@ endif
140141

141142
doc: $(DOCS)
142143

143-
$(DOCDIR)/%.html : src/%.d $(DMD)
144+
$(DOC_OUTPUT_DIR)/%.html : src/%.d $(DMD)
144145
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
145146

146-
$(DOCDIR)/core_%.html : src/core/%.d $(DMD)
147+
$(DOC_OUTPUT_DIR)/core_%.html : src/core/%.d $(DMD)
147148
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
148149

149-
$(DOCDIR)/core_experimental_%.html : src/core/experimental/%.d $(DMD)
150+
$(DOC_OUTPUT_DIR)/core_experimental_%.html : src/core/experimental/%.d $(DMD)
150151
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
151152

152-
$(DOCDIR)/core_gc_%.html : src/core/gc/%.d $(DMD)
153+
$(DOC_OUTPUT_DIR)/core_gc_%.html : src/core/gc/%.d $(DMD)
153154
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
154155

155-
$(DOCDIR)/core_internal_%.html : src/core/internal/%.d $(DMD)
156+
$(DOC_OUTPUT_DIR)/core_internal_%.html : src/core/internal/%.d $(DMD)
156157
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
157158

158-
$(DOCDIR)/core_internal_array_%.html : src/core/internal/array/%.d $(DMD)
159+
$(DOC_OUTPUT_DIR)/core_internal_array_%.html : src/core/internal/array/%.d $(DMD)
159160
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
160161

161-
$(DOCDIR)/core_internal_backtrace_%.html : src/core/internal/backtrace/%.d $(DMD)
162+
$(DOC_OUTPUT_DIR)/core_internal_backtrace_%.html : src/core/internal/backtrace/%.d $(DMD)
162163
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
163164

164-
$(DOCDIR)/core_internal_container_%.html : src/core/internal/container/%.d $(DMD)
165+
$(DOC_OUTPUT_DIR)/core_internal_container_%.html : src/core/internal/container/%.d $(DMD)
165166
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
166167

167-
$(DOCDIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
168+
$(DOC_OUTPUT_DIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
168169
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
169170

170-
$(DOCDIR)/core_internal_gc_%.html : src/core/internal/gc/%.d $(DMD)
171+
$(DOC_OUTPUT_DIR)/core_internal_gc_%.html : src/core/internal/gc/%.d $(DMD)
171172
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
172173

173-
$(DOCDIR)/core_internal_gc_impl_%.html : src/core/internal/gc/impl/%.d $(DMD)
174+
$(DOC_OUTPUT_DIR)/core_internal_gc_impl_%.html : src/core/internal/gc/impl/%.d $(DMD)
174175
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
175176

176-
$(DOCDIR)/core_internal_gc_impl_conservative_%.html : src/core/internal/gc/impl/conservative/%.d $(DMD)
177+
$(DOC_OUTPUT_DIR)/core_internal_gc_impl_conservative_%.html : src/core/internal/gc/impl/conservative/%.d $(DMD)
177178
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
178179

179-
$(DOCDIR)/core_internal_gc_impl_manual_%.html : src/core/internal/gc/impl/manual/%.d $(DMD)
180+
$(DOC_OUTPUT_DIR)/core_internal_gc_impl_manual_%.html : src/core/internal/gc/impl/manual/%.d $(DMD)
180181
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
181182

182-
$(DOCDIR)/core_internal_gc_impl_proto_%.html : src/core/internal/gc/impl/proto/%.d $(DMD)
183+
$(DOC_OUTPUT_DIR)/core_internal_gc_impl_proto_%.html : src/core/internal/gc/impl/proto/%.d $(DMD)
183184
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
184185

185-
$(DOCDIR)/core_internal_util_%.html : src/core/internal/util/%.d $(DMD)
186+
$(DOC_OUTPUT_DIR)/core_internal_util_%.html : src/core/internal/util/%.d $(DMD)
186187
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
187188

188-
$(DOCDIR)/core_internal_vararg_%.html : src/core/internal/vararg/%.d $(DMD)
189+
$(DOC_OUTPUT_DIR)/core_internal_vararg_%.html : src/core/internal/vararg/%.d $(DMD)
189190
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
190191

191-
$(DOCDIR)/core_stdc_%.html : src/core/stdc/%.d $(DMD)
192+
$(DOC_OUTPUT_DIR)/core_stdc_%.html : src/core/stdc/%.d $(DMD)
192193
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
193194

194-
$(DOCDIR)/core_stdcpp_%.html : src/core/stdcpp/%.d $(DMD)
195+
$(DOC_OUTPUT_DIR)/core_stdcpp_%.html : src/core/stdcpp/%.d $(DMD)
195196
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
196197

197-
$(DOCDIR)/core_sync_%.html : src/core/sync/%.d $(DMD)
198+
$(DOC_OUTPUT_DIR)/core_sync_%.html : src/core/sync/%.d $(DMD)
198199
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
199200

200-
$(DOCDIR)/core_sys_bionic_%.html : src/core/sys/bionic/%.d $(DMD)
201+
$(DOC_OUTPUT_DIR)/core_sys_bionic_%.html : src/core/sys/bionic/%.d $(DMD)
201202
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
202203

203-
$(DOCDIR)/core_sys_darwin_%.html : src/core/sys/darwin/%.d $(DMD)
204+
$(DOC_OUTPUT_DIR)/core_sys_darwin_%.html : src/core/sys/darwin/%.d $(DMD)
204205
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
205206

206-
$(DOCDIR)/core_sys_darwin_mach_%.html : src/core/sys/darwin/mach/%.d $(DMD)
207+
$(DOC_OUTPUT_DIR)/core_sys_darwin_mach_%.html : src/core/sys/darwin/mach/%.d $(DMD)
207208
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
208209

209-
$(DOCDIR)/core_sys_darwin_netinet_%.html : src/core/sys/darwin/netinet/%.d $(DMD)
210+
$(DOC_OUTPUT_DIR)/core_sys_darwin_netinet_%.html : src/core/sys/darwin/netinet/%.d $(DMD)
210211
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
211212

212-
$(DOCDIR)/core_sys_darwin_sys_%.html : src/core/sys/darwin/sys/%.d $(DMD)
213+
$(DOC_OUTPUT_DIR)/core_sys_darwin_sys_%.html : src/core/sys/darwin/sys/%.d $(DMD)
213214
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
214215

215-
$(DOCDIR)/core_sys_dragonflybsd_%.html : src/core/sys/dragonflybsd/%.d $(DMD)
216+
$(DOC_OUTPUT_DIR)/core_sys_dragonflybsd_%.html : src/core/sys/dragonflybsd/%.d $(DMD)
216217
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
217218

218-
$(DOCDIR)/core_sys_dragonflybsd_netinet_%.html : src/core/sys/dragonflybsd/netinet/%.d $(DMD)
219+
$(DOC_OUTPUT_DIR)/core_sys_dragonflybsd_netinet_%.html : src/core/sys/dragonflybsd/netinet/%.d $(DMD)
219220
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
220221

221-
$(DOCDIR)/core_sys_dragonflybsd_sys_%.html : src/core/sys/dragonflybsd/sys/%.d $(DMD)
222+
$(DOC_OUTPUT_DIR)/core_sys_dragonflybsd_sys_%.html : src/core/sys/dragonflybsd/sys/%.d $(DMD)
222223
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
223224

224-
$(DOCDIR)/core_sys_freebsd_%.html : src/core/sys/freebsd/%.d $(DMD)
225+
$(DOC_OUTPUT_DIR)/core_sys_freebsd_%.html : src/core/sys/freebsd/%.d $(DMD)
225226
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
226227

227-
$(DOCDIR)/core_sys_freebsd_netinet_%.html : src/core/sys/freebsd/netinet/%.d $(DMD)
228+
$(DOC_OUTPUT_DIR)/core_sys_freebsd_netinet_%.html : src/core/sys/freebsd/netinet/%.d $(DMD)
228229
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
229230

230-
$(DOCDIR)/core_sys_freebsd_sys_%.html : src/core/sys/freebsd/sys/%.d $(DMD)
231+
$(DOC_OUTPUT_DIR)/core_sys_freebsd_sys_%.html : src/core/sys/freebsd/sys/%.d $(DMD)
231232
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
232233

233-
$(DOCDIR)/core_sys_linux_%.html : src/core/sys/linux/%.d $(DMD)
234+
$(DOC_OUTPUT_DIR)/core_sys_linux_%.html : src/core/sys/linux/%.d $(DMD)
234235
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
235236

236-
$(DOCDIR)/core_sys_linux_netinet_%.html : src/core/sys/linux/netinet/%.d $(DMD)
237+
$(DOC_OUTPUT_DIR)/core_sys_linux_netinet_%.html : src/core/sys/linux/netinet/%.d $(DMD)
237238
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
238239

239-
$(DOCDIR)/core_sys_linux_sys_%.html : src/core/sys/linux/sys/%.d $(DMD)
240+
$(DOC_OUTPUT_DIR)/core_sys_linux_sys_%.html : src/core/sys/linux/sys/%.d $(DMD)
240241
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
241242

242-
$(DOCDIR)/core_sys_netbsd_%.html : src/core/sys/netbsd/%.d $(DMD)
243+
$(DOC_OUTPUT_DIR)/core_sys_netbsd_%.html : src/core/sys/netbsd/%.d $(DMD)
243244
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
244245

245-
$(DOCDIR)/core_sys_netbsd_sys_%.html : src/core/sys/netbsd/sys/%.d $(DMD)
246+
$(DOC_OUTPUT_DIR)/core_sys_netbsd_sys_%.html : src/core/sys/netbsd/sys/%.d $(DMD)
246247
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
247248

248-
$(DOCDIR)/core_sys_openbsd_%.html : src/core/sys/openbsd/%.d $(DMD)
249+
$(DOC_OUTPUT_DIR)/core_sys_openbsd_%.html : src/core/sys/openbsd/%.d $(DMD)
249250
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
250251

251-
$(DOCDIR)/core_sys_openbsd_sys_%.html : src/core/sys/openbsd/sys/%.d $(DMD)
252+
$(DOC_OUTPUT_DIR)/core_sys_openbsd_sys_%.html : src/core/sys/openbsd/sys/%.d $(DMD)
252253
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
253254

254-
$(DOCDIR)/core_sys_posix_%.html : src/core/sys/posix/%.d $(DMD)
255+
$(DOC_OUTPUT_DIR)/core_sys_posix_%.html : src/core/sys/posix/%.d $(DMD)
255256
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
256257

257-
$(DOCDIR)/core_sys_posix_arpa_%.html : src/core/sys/posix/arpa/%.d $(DMD)
258+
$(DOC_OUTPUT_DIR)/core_sys_posix_arpa_%.html : src/core/sys/posix/arpa/%.d $(DMD)
258259
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
259260

260-
$(DOCDIR)/core_sys_posix_net_%.html : src/core/sys/posix/net/%.d $(DMD)
261+
$(DOC_OUTPUT_DIR)/core_sys_posix_net_%.html : src/core/sys/posix/net/%.d $(DMD)
261262
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
262263

263-
$(DOCDIR)/core_sys_posix_netinet_%.html : src/core/sys/posix/netinet/%.d $(DMD)
264+
$(DOC_OUTPUT_DIR)/core_sys_posix_netinet_%.html : src/core/sys/posix/netinet/%.d $(DMD)
264265
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
265266

266-
$(DOCDIR)/core_sys_posix_stdc_%.html : src/core/sys/posix/stdc/%.d $(DMD)
267+
$(DOC_OUTPUT_DIR)/core_sys_posix_stdc_%.html : src/core/sys/posix/stdc/%.d $(DMD)
267268
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
268269

269-
$(DOCDIR)/core_sys_posix_sys_%.html : src/core/sys/posix/sys/%.d $(DMD)
270+
$(DOC_OUTPUT_DIR)/core_sys_posix_sys_%.html : src/core/sys/posix/sys/%.d $(DMD)
270271
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
271272

272-
$(DOCDIR)/core_sys_solaris_%.html : src/core/sys/solaris/%.d $(DMD)
273+
$(DOC_OUTPUT_DIR)/core_sys_solaris_%.html : src/core/sys/solaris/%.d $(DMD)
273274
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
274275

275-
$(DOCDIR)/core_sys_solaris_sys_%.html : src/core/sys/solaris/sys/%.d $(DMD)
276+
$(DOC_OUTPUT_DIR)/core_sys_solaris_sys_%.html : src/core/sys/solaris/sys/%.d $(DMD)
276277
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
277278

278-
$(DOCDIR)/core_sys_windows_%.html : src/core/sys/windows/%.d $(DMD)
279+
$(DOC_OUTPUT_DIR)/core_sys_windows_%.html : src/core/sys/windows/%.d $(DMD)
279280
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
280281

281-
$(DOCDIR)/core_sys_windows_stdc_%.html : src/core/sys/windows/stdc/%.d $(DMD)
282+
$(DOC_OUTPUT_DIR)/core_sys_windows_stdc_%.html : src/core/sys/windows/stdc/%.d $(DMD)
282283
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
283284

284-
$(DOCDIR)/core_thread.html : src/core/thread/package.d $(DMD)
285+
$(DOC_OUTPUT_DIR)/core_thread.html : src/core/thread/package.d $(DMD)
285286
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
286287

287-
$(DOCDIR)/core_thread_%.html : src/core/thread/%.d $(DMD)
288+
$(DOC_OUTPUT_DIR)/core_thread_%.html : src/core/thread/%.d $(DMD)
288289
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
289290

290-
$(DOCDIR)/etc_linux_%.html : src/etc/linux/%.d $(DMD)
291+
$(DOC_OUTPUT_DIR)/etc_linux_%.html : src/etc/linux/%.d $(DMD)
291292
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
292293

293-
$(DOCDIR)/gc_%.html : src/gc/%.d $(DMD)
294+
$(DOC_OUTPUT_DIR)/gc_%.html : src/gc/%.d $(DMD)
294295
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
295296

296-
$(DOCDIR)/gc_impl_%.html : src/gc/impl/%.d $(DMD)
297+
$(DOC_OUTPUT_DIR)/gc_impl_%.html : src/gc/impl/%.d $(DMD)
297298
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
298299

299-
$(DOCDIR)/gc_impl_conservative_%.html : src/gc/impl/conservative/%.d $(DMD)
300+
$(DOC_OUTPUT_DIR)/gc_impl_conservative_%.html : src/gc/impl/conservative/%.d $(DMD)
300301
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
301302

302-
$(DOCDIR)/gc_impl_manual_%.html : src/gc/impl/manual/%.d $(DMD)
303+
$(DOC_OUTPUT_DIR)/gc_impl_manual_%.html : src/gc/impl/manual/%.d $(DMD)
303304
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
304305

305-
$(DOCDIR)/gc_impl_proto_%.html : src/gc/impl/proto/%.d $(DMD)
306+
$(DOC_OUTPUT_DIR)/gc_impl_proto_%.html : src/gc/impl/proto/%.d $(DMD)
306307
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
307308

308-
$(DOCDIR)/rt_%.html : src/rt/%.d $(DMD)
309+
$(DOC_OUTPUT_DIR)/rt_%.html : src/rt/%.d $(DMD)
309310
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
310311

311-
$(DOCDIR)/rt_typeinfo_%.html : src/rt/typeinfo/%.d $(DMD)
312+
$(DOC_OUTPUT_DIR)/rt_typeinfo_%.html : src/rt/typeinfo/%.d $(DMD)
312313
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
313314

314-
$(DOCDIR)/rt_util_%.html : src/rt/util/%.d $(DMD)
315+
$(DOC_OUTPUT_DIR)/rt_util_%.html : src/rt/util/%.d $(DMD)
315316
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
316317

317318
######################## Header .di file generation ##############################
@@ -502,7 +503,7 @@ install: target
502503
endif
503504

504505
clean: $(addsuffix /.clean,$(ADDITIONAL_TESTS))
505-
rm -rf $(ROOT_OF_THEM_ALL) $(IMPDIR) $(DOCDIR) druntime.zip
506+
rm -rf $(ROOT_OF_THEM_ALL) $(IMPDIR) $(DOC_OUTPUT_DIR) druntime.zip
506507

507508
test/%/.clean: test/%/Makefile
508509
$(MAKE) -C test/$* clean

0 commit comments

Comments
 (0)