diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-10 22:01:41 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-07-11 11:39:04 +0100 |
| commit | ca9036155d28ed9f5a1406356316c3fd41e5a400 (patch) | |
| tree | 0d4a450a1356867d86c2605d2dfbf5aeead5d2b9 /Makefile | |
| parent | d1cf45911935cc4fed9afd3a37d99616d31eb9da (diff) | |
build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -26,6 +26,7 @@ CFLAGS += $(ECFLAGS) CCFLAGS = $(CFLAGS) YASMFLAGS += $(IFLAGS) -Pconfig.asm HOSTCFLAGS += $(IFLAGS) +LDFLAGS += $(ALLFFLIBS:%=-Llib%) define COMPILE $($(1)DEP) @@ -82,7 +83,6 @@ SKIPHEADERS = cmdutils_common_opts.h include $(SRC_PATH)/common.mak -FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) @@ -118,10 +118,10 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) ffplay.o: CFLAGS += $(SDL_CFLAGS) ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) +ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) OBJDIRS += tools |