diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-05-18 15:12:46 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-05-18 15:12:46 +0200 |
| commit | 2d407ee533f68d19ff90abd4da37c7cc8a74afc2 (patch) | |
| tree | 4d0258178dd44fa0e5a5dab13e5ead099d0dfb4e /external_tests/der_gtest | |
| parent | a45d6b1d78cd8329cbab1e1c2b7397cb55d092b9 (diff) | |
| download | nss-hg-2d407ee533f68d19ff90abd4da37c7cc8a74afc2.tar.gz | |
Bug 1242565 - follow up to reuse gtests.o, r=mt
Diffstat (limited to 'external_tests/der_gtest')
| -rw-r--r-- | external_tests/der_gtest/Makefile | 2 | ||||
| -rw-r--r-- | external_tests/der_gtest/manifest.mn | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/external_tests/der_gtest/Makefile b/external_tests/der_gtest/Makefile index 9f76df79f..0d547e080 100644 --- a/external_tests/der_gtest/Makefile +++ b/external_tests/der_gtest/Makefile @@ -41,5 +41,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - -ALL_TRASH += common diff --git a/external_tests/der_gtest/manifest.mn b/external_tests/der_gtest/manifest.mn index a7ff3f161..1c73d09f4 100644 --- a/external_tests/der_gtest/manifest.mn +++ b/external_tests/der_gtest/manifest.mn @@ -8,7 +8,6 @@ MODULE = nss CPPSRCS = \ der_getint_unittest.cc \ - ../common/gtests.cc \ $(NULL) INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ @@ -17,4 +16,6 @@ INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \ REQUIRES = nspr nss libdbm gtest PROGRAM = der_gtest -EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) + +EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) $(EXTRA_OBJS) \ + ../common/$(OBJDIR)/gtests$(OBJ_SUFFIX) |