Message ID | 20241010113509.3874077-2-ross.burton@arm.com |
---|---|
State | New |
Headers | show |
Series | [ptest-runner,1/2] Makefile: remove redundant rule | expand |
Applied, Thanks!, Anibal On Thu, Oct 10, 2024 at 5:35 AM Ross Burton <ross.burton@arm.com> wrote: > Don't hardcode the linkage, instead use pkg-config to find the required > flags. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index 08bc19c..662ced7 100644 > --- a/Makefile > +++ b/Makefile > @@ -27,8 +27,8 @@ EXECUTABLE=ptest-runner > TEST_SOURCES=tests/main.c tests/ptest_list.c tests/utils.c $(BASE_SOURCES) > TEST_OBJECTS=$(TEST_SOURCES:.c=.o) > TEST_EXECUTABLE=ptest-runner-test > -TEST_LDFLAGS=-lm -lrt -lpthread > -TEST_LIBSTATIC=-lcheck -lsubunit -lutil > +TEST_CFLAGS=$(shell pkg-config --cflags check) > +TEST_LDFLAGS=$(shell pkg-config --libs check) > > TEST_DATA=$(shell echo `pwd`/tests/data) > > @@ -40,7 +40,7 @@ $(EXECUTABLE): $(OBJECTS) > tests: $(TEST_SOURCES) $(TEST_EXECUTABLE) > > $(TEST_EXECUTABLE): $(TEST_OBJECTS) > - $(CC) $(LDFLAGS) $(TEST_OBJECTS) -o $@ $(TEST_LIBSTATIC) > $(TEST_LDFLAGS) > + $(CC) $(LDFLAGS) $(TEST_OBJECTS) -o $@ $(TEST_CFLAGS) > $(TEST_LDFLAGS) > > check: $(TEST_EXECUTABLE) > PATH=.:$(PATH) ./$(TEST_EXECUTABLE) -d $(TEST_DATA) > -- > 2.34.1 > >
diff --git a/Makefile b/Makefile index 08bc19c..662ced7 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,8 @@ EXECUTABLE=ptest-runner TEST_SOURCES=tests/main.c tests/ptest_list.c tests/utils.c $(BASE_SOURCES) TEST_OBJECTS=$(TEST_SOURCES:.c=.o) TEST_EXECUTABLE=ptest-runner-test -TEST_LDFLAGS=-lm -lrt -lpthread -TEST_LIBSTATIC=-lcheck -lsubunit -lutil +TEST_CFLAGS=$(shell pkg-config --cflags check) +TEST_LDFLAGS=$(shell pkg-config --libs check) TEST_DATA=$(shell echo `pwd`/tests/data) @@ -40,7 +40,7 @@ $(EXECUTABLE): $(OBJECTS) tests: $(TEST_SOURCES) $(TEST_EXECUTABLE) $(TEST_EXECUTABLE): $(TEST_OBJECTS) - $(CC) $(LDFLAGS) $(TEST_OBJECTS) -o $@ $(TEST_LIBSTATIC) $(TEST_LDFLAGS) + $(CC) $(LDFLAGS) $(TEST_OBJECTS) -o $@ $(TEST_CFLAGS) $(TEST_LDFLAGS) check: $(TEST_EXECUTABLE) PATH=.:$(PATH) ./$(TEST_EXECUTABLE) -d $(TEST_DATA)
Don't hardcode the linkage, instead use pkg-config to find the required flags. Signed-off-by: Ross Burton <ross.burton@arm.com> --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)