On Tue, 3 Mar 2015, Michael Olbrich wrote: > Only add '-lrttest -L.' where it's actually needed. > Use '$<' instead of '$^'. Otherwise librttest is added twice: > As 'librttest.a' and as '-lrttest'. > > Signed-off-by: Michael Olbrich <m.olbrich@xxxxxxxxxxxxxx> > --- > > Better like this? > > Michael > > Makefile | 25 +++++++++++++------------ > 1 file changed, 13 insertions(+), 12 deletions(-) > > diff --git a/Makefile b/Makefile > index da7b419c4bcd..5d7f449cc026 100644 > --- a/Makefile > +++ b/Makefile > @@ -11,7 +11,8 @@ sources += signaltest.c ptsematest.c sigwaittest.c svsematest.c sendme.c \ > > TARGETS = $(sources:.c=) > > -LIBS = -lrt -lpthread -lrttest -L. > +LIBS = -lrt -lpthread > +RTTESTLIB = -lrttest -L. > EXTRA_LIBS ?= -ldl # for get_cpu > DESTDIR ?= > prefix ?= /usr/local > @@ -68,41 +69,41 @@ all: $(TARGETS) hwlatdetect > -include $(sources:.c=.d) > > cyclictest: cyclictest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(NUMA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(NUMA_LIBS) > > signaltest: signaltest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) > > pi_stress: pi_stress.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) > > hwlatdetect: src/hwlatdetect/hwlatdetect.py > chmod +x src/hwlatdetect/hwlatdetect.py > ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect > > rt-migrate-test: rt-migrate-test.o > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) > > ptsematest: ptsematest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) > > sigwaittest: sigwaittest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) > > svsematest: svsematest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) > > pmqtest: pmqtest.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) > > sendme: sendme.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS) > > pip_stress: pip_stress.o librttest.a > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) > > hackbench: hackbench.o > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) > + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) > > librttest.a: rt-utils.o error.o rt-get_cpu.o rt-sched.o > $(AR) rcs librttest.a $^ > -- > 2.1.4 > > Thats better, thanks applied. Signed-off-by: John Kacur <jkacur@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
