Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make test suite link to static LDNS rather than dynamic. #200

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@

# Hmmm gcc 4.6.1 expects $(LIBS) as the last argument

Expand All @@ -31,7 +31,7 @@ TESTS = 12-unit-tests-dnssec
all: $(TESTS)

12-unit-tests-dnssec: 12-unit-tests-dnssec.o
$(LINK) -o $@ $+ $(LIBS)
$(LINK) -o $@ $+ ../../.libs/libldns.a $(LIBS)

clean:
rm -f *.o
Expand Down
6 changes: 3 additions & 3 deletions test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@

COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS)
Expand All @@ -29,7 +29,7 @@ TESTS = 13-unit-tests-base
all: $(TESTS)

13-unit-tests-base: 13-unit-tests-base.o
$(LINK) -o $@ $+ $(LIBS)
$(LINK) -o $@ $+ ../../.libs/libldns.a $(LIBS)

clean:
rm -f *.o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@

COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS)
Expand All @@ -29,7 +29,7 @@ TESTS = 15-unit-tests-rrtypes
all: $(TESTS)

15-unit-tests-rrtypes: 15-unit-tests-rrtypes.o
$(LINK) -o $@ $+ $(LIBS)
$(LINK) -o $@ $+ ../../.libs/libldns.a $(LIBS)

clean:
rm -f *.o
Expand Down
6 changes: 3 additions & 3 deletions test/16-unit-tests-edns.tpkg/16-unit-tests-edns.Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ datarootdir = @datarootdir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@
LIBS = @LIBS@ @LIBSSL_SSL_LIBS@

COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS)
Expand All @@ -29,7 +29,7 @@ TESTS = 16-unit-tests-edns
all: $(TESTS)

16-unit-tests-edns: 16-unit-tests-edns.o
$(LINK) -o $@ $+ $(LIBS)
$(LINK) -o $@ $+ ../../.libs/libldns.a $(LIBS)

clean:
rm -f *.o
Expand Down