From 034d3e6f29d80a5e4f29ad00250bc5e0b2332b72 Mon Sep 17 00:00:00 2001 From: Michael Tuexen <tuexen@fh-muenster.de> Date: Sun, 29 Apr 2018 17:07:11 +0200 Subject: [PATCH] Reduce differences in Makefiles to Google's V2. --- gtests/net/packetdrill/Makefile.Linux | 2 +- gtests/net/packetdrill/Makefile.common | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gtests/net/packetdrill/Makefile.Linux b/gtests/net/packetdrill/Makefile.Linux index 964c8e76..2310254b 100644 --- a/gtests/net/packetdrill/Makefile.Linux +++ b/gtests/net/packetdrill/Makefile.Linux @@ -1,2 +1,2 @@ -packetdrill-ext-libs := -lpthread -lrt -lsctp +packetdrill-ext-libs := -lpthread -lrt -ldl -lsctp -static include Makefile.common diff --git a/gtests/net/packetdrill/Makefile.common b/gtests/net/packetdrill/Makefile.common index d7ce394e..c019a4c3 100644 --- a/gtests/net/packetdrill/Makefile.common +++ b/gtests/net/packetdrill/Makefile.common @@ -1,7 +1,6 @@ all: binaries CFLAGS += -g -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member -LDFLAGS ?= -static parser.o: parser.y bison --output=parser.c --defines=parser.h --report=state parser.y @@ -37,7 +36,7 @@ packetdrill-lib := \ packetdrill-objs := packetdrill.o $(packetdrill-lib) packetdrill: $(packetdrill-objs) - $(CC) -o packetdrill -g $(LDFLAGS) $(packetdrill-objs) $(packetdrill-ext-libs) + $(CC) -o packetdrill -g $(packetdrill-objs) $(packetdrill-ext-libs) test-bins := checksum_test packet_parser_test packet_to_string_test tests: $(test-bins) -- GitLab