Skip to content

Commit 737dd48

Browse files
committed
posix.mak: Fix default target
The default target of a Makefile is usually the first defined non-pattern target. The intended default target of dlang.org's posix.mak is the 'all' target, however this was broken in 44dd86f by introducing a non-pattern target among the pattern targets (in order to specialize building error pages as necessary to fix relative links to resources). Move the non-pattern rules block (which includes the intended default target, 'all') above the pattern rules block to fix the intended default target.
1 parent c1d57d6 commit 737dd48

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

posix.mak

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -185,58 +185,6 @@ $(PREMADE) $(STYLES) $(IMAGES) $(JAVASCRIPT))
185185

186186
ALL_FILES = $(ALL_FILES_BUT_SITEMAP) $(DOC_OUTPUT_DIR)/sitemap.html
187187

188-
################################################################################
189-
# Pattern rulez
190-
################################################################################
191-
192-
# NOTE: Depending on the version of make, order matters here. Therefore, put
193-
# sub-directories before their parents.
194-
195-
$(DOC_OUTPUT_DIR)/changelog/%.html : changelog/%_pre.dd $(CHANGELOG_PRE_DDOC) $(DMD)
196-
$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_PRE_DDOC) $<
197-
198-
$(DOC_OUTPUT_DIR)/changelog/%.html : changelog/%.dd $(CHANGELOG_DDOC) $(DMD)
199-
$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_DDOC) $<
200-
201-
$(DOC_OUTPUT_DIR)/spec/%.html : spec/%.dd $(SPEC_DDOC) $(DMD)
202-
$(DMD) -c -o- -Df$@ $(SPEC_DDOC) $<
203-
204-
$(DOC_OUTPUT_DIR)/404.html : 404.dd $(DDOC) $(DMD)
205-
$(DMD) -conf= -c -o- -Df$@ $(DDOC) errorpage.ddoc $<
206-
207-
$(DOC_OUTPUT_DIR)/%.html : %.dd $(DDOC) $(DMD)
208-
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $<
209-
210-
$(DOC_OUTPUT_DIR)/%.verbatim : %_pre.dd verbatim.ddoc $(DMD)
211-
$(DMD) -c -o- -Df$@ verbatim.ddoc $<
212-
213-
$(DOC_OUTPUT_DIR)/%.verbatim : %.dd verbatim.ddoc $(DMD)
214-
$(DMD) -c -o- -Df$@ verbatim.ddoc $<
215-
216-
$(DOC_OUTPUT_DIR)/%.php : %.php.dd $(DDOC) $(DMD)
217-
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $<
218-
219-
$(DOC_OUTPUT_DIR)/css/% : css/%
220-
@mkdir -p $(dir $@)
221-
ifeq (1,$(CSS_MINIFY))
222-
curl -X POST -fsS --data-urlencode 'input@$<' http://cssminifier.com/raw >$@
223-
else
224-
cp $< $@
225-
endif
226-
227-
$(DOC_OUTPUT_DIR)/%.css : %.css.dd $(DMD)
228-
$(DMD) -c -o- -Df$@ $<
229-
230-
$(DOC_OUTPUT_DIR)/% : %
231-
@mkdir -p $(dir $@)
232-
cp $< $@
233-
234-
$(DOC_OUTPUT_DIR)/dmd-%.html : %.ddoc dcompiler.dd $(DDOC) $(DMD)
235-
$(DMD) -conf= -c -o- -Df$@ $(DDOC) dcompiler.dd $<
236-
237-
$(DOC_OUTPUT_DIR)/dmd-%.verbatim : %.ddoc dcompiler.dd verbatim.ddoc $(DMD)
238-
$(DMD) -c -o- -Df$@ verbatim.ddoc dcompiler.dd $<
239-
240188
################################################################################
241189
# Rulez
242190
################################################################################
@@ -298,6 +246,58 @@ rsync : all kindle pdf
298246
rsync-only :
299247
rsync -avzO --chmod=u=rwX,g=rwX,o=rX --delete $(RSYNC_FILTER) $(DOC_OUTPUT_DIR)/ $(REMOTE_DIR)/
300248

249+
################################################################################
250+
# Pattern rulez
251+
################################################################################
252+
253+
# NOTE: Depending on the version of make, order matters here. Therefore, put
254+
# sub-directories before their parents.
255+
256+
$(DOC_OUTPUT_DIR)/changelog/%.html : changelog/%_pre.dd $(CHANGELOG_PRE_DDOC) $(DMD)
257+
$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_PRE_DDOC) $<
258+
259+
$(DOC_OUTPUT_DIR)/changelog/%.html : changelog/%.dd $(CHANGELOG_DDOC) $(DMD)
260+
$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_DDOC) $<
261+
262+
$(DOC_OUTPUT_DIR)/spec/%.html : spec/%.dd $(SPEC_DDOC) $(DMD)
263+
$(DMD) -c -o- -Df$@ $(SPEC_DDOC) $<
264+
265+
$(DOC_OUTPUT_DIR)/404.html : 404.dd $(DDOC) $(DMD)
266+
$(DMD) -conf= -c -o- -Df$@ $(DDOC) errorpage.ddoc $<
267+
268+
$(DOC_OUTPUT_DIR)/%.html : %.dd $(DDOC) $(DMD)
269+
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $<
270+
271+
$(DOC_OUTPUT_DIR)/%.verbatim : %_pre.dd verbatim.ddoc $(DMD)
272+
$(DMD) -c -o- -Df$@ verbatim.ddoc $<
273+
274+
$(DOC_OUTPUT_DIR)/%.verbatim : %.dd verbatim.ddoc $(DMD)
275+
$(DMD) -c -o- -Df$@ verbatim.ddoc $<
276+
277+
$(DOC_OUTPUT_DIR)/%.php : %.php.dd $(DDOC) $(DMD)
278+
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $<
279+
280+
$(DOC_OUTPUT_DIR)/css/% : css/%
281+
@mkdir -p $(dir $@)
282+
ifeq (1,$(CSS_MINIFY))
283+
curl -X POST -fsS --data-urlencode 'input@$<' http://cssminifier.com/raw >$@
284+
else
285+
cp $< $@
286+
endif
287+
288+
$(DOC_OUTPUT_DIR)/%.css : %.css.dd $(DMD)
289+
$(DMD) -c -o- -Df$@ $<
290+
291+
$(DOC_OUTPUT_DIR)/% : %
292+
@mkdir -p $(dir $@)
293+
cp $< $@
294+
295+
$(DOC_OUTPUT_DIR)/dmd-%.html : %.ddoc dcompiler.dd $(DDOC) $(DMD)
296+
$(DMD) -conf= -c -o- -Df$@ $(DDOC) dcompiler.dd $<
297+
298+
$(DOC_OUTPUT_DIR)/dmd-%.verbatim : %.ddoc dcompiler.dd verbatim.ddoc $(DMD)
299+
$(DMD) -c -o- -Df$@ verbatim.ddoc dcompiler.dd $<
300+
301301
################################################################################
302302
# Ebook
303303
################################################################################

0 commit comments

Comments
 (0)