Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-01-09 12:08:34 -08:00
commit 1693e4f257
1 changed files with 4 additions and 4 deletions

View File

@ -96,7 +96,7 @@ ifneq ($(TC_CONFIG_NO_XT),y)
endif
TCOBJ += $(TCMODULES)
LDLIBS += -L. -ltc -lm
LDLIBS += -L. -lm
ifeq ($(SHARED_LIBS),y)
LDLIBS += -ldl
@ -124,13 +124,13 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic $< -o $@
all: libtc.a tc $(TCSO)
all: tc $(TCSO)
tc: $(TCOBJ) $(TCLIB)
tc: $(TCOBJ) libtc.a
$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
libtc.a: $(TCLIB)
$(QUIET_AR)$(AR) rcs $@ $(TCLIB)
$(QUIET_AR)$(AR) rcs $@ $^
install: all
mkdir -p $(MODDESTDIR)