diff options
| author | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
| commit | 4c333a25a88b1afac2ed50bf1b9af61dc5b09343 (patch) | |
| tree | d4b90a7bc46e9da364efb74365a0af604b38e424 /test/libapt/makefile | |
| parent | bca84917c326fa3158e120147c8aecebe0789b47 (diff) | |
| parent | 6eb377fb9fba6b7f17f635143e9201f0d62a50fb (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/gpgv.cc
Diffstat (limited to 'test/libapt/makefile')
| -rw-r--r-- | test/libapt/makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/libapt/makefile b/test/libapt/makefile index 69a13fd92..7f23ace46 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -14,8 +14,8 @@ test: $(BIN)/gtest$(BASENAME) $(BIN)/gtest$(BASENAME): $(LIB)/gtest.a PROGRAM = gtest${BASENAME} -SLIBS = -lapt-pkg -pthread $(LIB)/gtest.a -LIB_MAKES = apt-pkg/makefile +SLIBS = -lapt-pkg -lapt-private -pthread $(LIB)/gtest.a +LIB_MAKES = apt-pkg/makefile apt-private/makefile SOURCE = gtest_runner.cc $(wildcard *-helpers.cc *_test.cc) include $(PROGRAM_H) |