Message ID | 1330352475-31109-1-git-send-email-yegorslists@googlemail.com |
---|---|
State | Accepted, archived |
Delegated to: | stephen hemminger |
Headers | show |
On Mon, 27 Feb 2012 15:21:15 +0100 yegorslists@googlemail.com wrote: > From: Yegor Yefremov <yegorslists@googlemail.com> > > LIBNETLINK will be defined in the main Makefile, so > both ../lib/libnetlink.a ../lib/libutil.a will be > automatically appended during linking. Otherwise > ../lib/libnetlink.a ../lib/libutil.a will appear > twice during linking. > > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/ip/Makefile b/ip/Makefile index 3f8c25b..e029ea1 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -17,11 +17,12 @@ ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon -all: $(TARGETS) $(SCRIPTS) $(LIBS) +all: $(TARGETS) $(SCRIPTS) -ip: $(IPOBJ) $(LIBNETLINK) $(LIBUTIL) +ip: $(IPOBJ) $(LIBNETLINK) -rtmon: $(RTMONOBJ) $(LIBNETLINK) + +rtmon: $(RTMONOBJ) install: all install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) diff --git a/misc/Makefile b/misc/Makefile index 8c25381..a59ff87 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -7,7 +7,7 @@ include ../Config all: $(TARGETS) -ss: $(SSOBJ) $(LIBUTIL) +ss: $(SSOBJ) nstat: nstat.c $(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c -lm diff --git a/tc/Makefile b/tc/Makefile index 9cc1bf0..f523adc 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -99,7 +99,7 @@ MODDESTDIR := $(DESTDIR)$(patsubst /usr%,%,$(LIBDIR))/tc all: libtc.a tc $(TCSO) -tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB) +tc: $(TCOBJ) $(TCLIB) libtc.a: $(TCLIB) $(AR) rcs $@ $(TCLIB)