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
56 56
57PROGS := $(PROGS-yes:%=%$(EXESUF))57PROGS := $(PROGS-yes:%=%$(EXESUF))
58OBJS = $(PROGS-yes:%=%.o) cmdutils.o58OBJS = $(PROGS-yes:%=%.o) cmdutils.o
59TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher))
60TESTTOOLS = audiogen videogen rotozoom tiny_psnr base6459TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
61HOSTPROGS := $(TESTTOOLS:%=tests/%)60HOSTPROGS := $(TESTTOOLS:%=tests/%)
62 61
@@ -117,12 +116,16 @@ ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) · 54 unmodified lines
117$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)116$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
118 $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)117 $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
119 118
119TOOLS = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher
120TOOLOBJS := $(TOOLS:%=tools/%.o)
121TOOLS := $(TOOLS:%=tools/%$(EXESUF))
122
120alltools: $(TOOLS)123alltools: $(TOOLS)
121 124
122tools/%$(EXESUF): tools/%.o125tools/%$(EXESUF): tools/%.o
123 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)126 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
124 127
125tools/%.o: tools/%.c | tools128$(TOOLOBJS): %.o: %.c | tools
126 $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<129 $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<
127 130
128OBJDIRS += tools131OBJDIRS += 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