Renamed cachelib to cache for NuCache.
git-svn-id: svn://10.0.0.236/trunk@12632 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -45,6 +45,10 @@ EXPORTS = PIMGCB.h PPSIMGCB.h
|
||||
|
||||
REQUIRES = zlib nspr jpeg util img png xpcom
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I../png -I. -I$(DEPTH)/dist/public/zlib
|
||||
|
||||
EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
|
||||
|
||||
@@ -50,6 +50,10 @@ EXPORTS = PIMGCB.h PPSIMGCB.h
|
||||
|
||||
REQUIRES = zlib nspr jpeg util img png xpcom
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../png -I$(srcdir) -I$(DEPTH)/dist/public/zlib
|
||||
|
||||
EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
|
||||
|
||||
@@ -55,7 +55,7 @@ LLIBS=$(DIST)\lib\png.lib \
|
||||
$(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
$(DIST)\lib\xpcom32.lib \
|
||||
!ifdef NU_CACHE
|
||||
$(DIST)\lib\cachelib.lib \
|
||||
$(DIST)\lib\cache.lib \
|
||||
!endif
|
||||
$(NULL)
|
||||
!else
|
||||
|
||||
@@ -67,6 +67,10 @@ REQUIRES = ldapurl imap4url jtools progress nspr2 dbm util js parse lay style pr
|
||||
libfont netcache httpurl cnetinit security img layer netcnvts network \
|
||||
mimetype ldap net
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
REQUIRES += mailbxurl nntpurl pop3url
|
||||
endif
|
||||
|
||||
@@ -77,6 +77,10 @@ ifdef MOZ_MAIL_NEWS
|
||||
REQUIRES += mailbxurl nntpurl pop3url
|
||||
endif
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
|
||||
@@ -106,7 +106,7 @@ LIBRARY_NAME=network
|
||||
EXTRA_LIBS=
|
||||
|
||||
!ifdef NU_CACHE
|
||||
REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress cachelib
|
||||
REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress cache
|
||||
!else
|
||||
REQUIRES= foo parse jtools java zlib nspr dbm util network js security mimetype ldap imap4url ldapurl net progress
|
||||
!endif
|
||||
|
||||
Reference in New Issue
Block a user