summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-09 14:52:00 +0200
committerClément Bœsch <u@pkh.me>2017-04-09 14:52:00 +0200
commit210678d3c5176d594bc9407cd73815944212fb9b (patch)
tree8ea276ed314910fd94bea7afd7c3422c1c410bd2 /Makefile
parenta329b822e17a39c173ffc5dfcc0dd21c95da1d9c (diff)
parent3794062ab1a13442b06f6d76c54dce51ffa54697 (diff)
Merge commit '3794062ab1a13442b06f6d76c54dce51ffa54697'
* commit '3794062ab1a13442b06f6d76c54dce51ffa54697': Remove Plan 9 support Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4fe0cdae35..aa23251c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
all: $(AVPROGS)
-$(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
+$(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
@@ -116,7 +116,7 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
include $(SRC_PATH)/doc/Makefile
define DOPROG
-OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
+OBJS-$(1) += $(1).o $(OBJS-$(1)-yes)
$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
$(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))