From 6d86d5201e125910e9b4694211d5cd72422609a4 Mon Sep 17 00:00:00 2001 From: "andreas.otte%primus-online.de" Date: Sat, 3 Jul 1999 08:39:50 +0000 Subject: [PATCH] making libcookie a component, adding tests if ENABLE_TESTS is set renaming testCookie to TestCookie --- extensions/cookie/Makefile.in | 17 ++++++++++------- extensions/cookie/tests/.cvsignore | 1 + extensions/cookie/tests/Makefile.in | 7 ++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 43624a4d1be5..aa6011903c63 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -26,8 +26,7 @@ include $(topsrcdir)/config/config.mk LIBRARY_NAME = cookie -CSRCS = \ - $(NULL) +IS_COMPONENT = 1 CPPSRCS = \ nsCookieService.cpp \ @@ -43,15 +42,19 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +ifdef ENABLE_TESTS +DIRS = tests +endif + MODULE = cookie REQUIRES = js netlib xpcom xppref32 nspr -MKSHLIB := - -# we don't want the shared lib -NO_SHARED_LIB=1 - include $(topsrcdir)/config/config.mk +# hack until necko lands +ifndef NECKO +PUBLIC=$(DEPTH)/netwerk/dist/include +endif + include $(topsrcdir)/config/rules.mk diff --git a/extensions/cookie/tests/.cvsignore b/extensions/cookie/tests/.cvsignore index f3c7a7c5da68..23b1a448174b 100644 --- a/extensions/cookie/tests/.cvsignore +++ b/extensions/cookie/tests/.cvsignore @@ -1 +1,2 @@ Makefile +TestCookie diff --git a/extensions/cookie/tests/Makefile.in b/extensions/cookie/tests/Makefile.in index c6f1359332d6..4c5635c72bb7 100644 --- a/extensions/cookie/tests/Makefile.in +++ b/extensions/cookie/tests/Makefile.in @@ -34,8 +34,13 @@ LIBS = \ $(NSPR_LIBS) \ $(NULL) -PROGRAM = testCookie +PROGRAM = TestCookie include $(topsrcdir)/config/config.mk +# hack until necko lands +ifndef NECKO +PUBLIC=$(DEPTH)/netwerk/dist/include +endif + include $(topsrcdir)/config/rules.mk