History

build: fix creation of tools dir with make 3.81

GNU make 3.81 apparently does not support order-only prerequisites with pattern rules, and thus fails to create the tools directory if it is missing. Naming the objects explicitly in the rule makes it work properly.

Mans Rullgard committed 15 years ago

Commit f6806981 parent e2542dc1 file · +5 −2Browse files

Unified · Split

Makefile+5−2
@@ -56,7 +56,6 @@ PROGS-$(CONFIG_FFSERVER) += ffserver · 55 unmodified lines
5656
5757 PROGS := $(PROGS-yes:%=%$(EXESUF))
5858 OBJS = $(PROGS-yes:%=%.o) cmdutils.o
59−TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher))
6059 TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
6160 HOSTPROGS := $(TESTTOOLS:%=tests/%)
6261
@@ -117,12 +116,16 @@ ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) · 54 unmodified lines
117116 $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
118117 $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
119118
119+TOOLS = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher
120+TOOLOBJS := $(TOOLS:%=tools/%.o)
121+TOOLS := $(TOOLS:%=tools/%$(EXESUF))
122+
120123 alltools: $(TOOLS)
121124
122125 tools/%$(EXESUF): tools/%.o
123126 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
124127
125−tools/%.o: tools/%.c | tools
128+$(TOOLOBJS): %.o: %.c | tools
126129 $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<
127130
128131 OBJDIRS += tools

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t