Removed MODULAR_NETLIB dependencies from makefiles.

git-svn-id: svn://10.0.0.236/trunk@29638 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/network/Makefile.in

@@ -33,9 +33,7 @@ DIRS	= \
 	main		\
 	protocol
 
-ifdef MODULAR_NETLIB
 DIRS	+= public module
-endif
 
 ifdef NU_CACHE
 DIRS += cache/nu

mozilla/network/client/Makefile.in

@@ -23,14 +23,6 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 MODULE		= cnetinit
 
-ifndef MODULAR_NETLIB
-LIBRARY_NAME	= cnetinit
-
-CSRCS		= \
-	cnetinit.c	\
-	$(NULL)
-endif
-
 EXPORTS= $(srcdir)/cnetinit.h
 
 REQUIRES	= netcache network img layer fileurl httpurl ftpurl abouturl \

mozilla/network/client/makefile.win

@@ -28,61 +28,6 @@ DEPTH=..\..
 MODULE=cnetinit 
 EXPORTS= cnetinit.h
 
-!ifndef MODULAR_NETLIB
-#
-# Make sure we have MOZILLA_CLIENT defined so we get the
-#   proper JS includes
-#
-LCFLAGS     = $(LCFLAGS)  -DMOZILLA_CLIENT
-
-!ifdef BUILD_DEBUG_GC
-LCFLAGS     = $(LCFLAGS) -DDEBUG_GC
-!endif
-
-LLIBS=  \
-    $(NULL)
-MISCDEP=$(LLIBS)
-OBJS=   \
-    .\$(OBJDIR)\cnetinit.obj        \
-    $(NULL)
-
-
-CSRCS = \
-    cnetinit.c  \
-    $(NULL)
-
-
-LIBRARY_NAME=cnetinit 
-
-LOCAL_INCLUDES=-I. 
-INCLUDES = $(LOCAL_INCLUDES)
-
-
-EXTRA_LIBS=
-
-REQUIRES= network security
-
-# use LINCS on win32 for now since REQUIRES seems to be broken
-#!if "$(MOZ_BITS)" != "16"
-LINCS= \
-    -I$(XPDIST)\public\network  \
-    -I$(XPDIST)\public\netcache     \
-    -I$(XPDIST)\public\abouturl     \
-    -I$(XPDIST)\public\dataurl  \
-    -I$(XPDIST)\public\fileurl  \
-    -I$(XPDIST)\public\ftpurl   \
-    -I$(XPDIST)\public\gophurl  \
-    -I$(XPDIST)\public\httpurl  \
-    -I$(XPDIST)\public\sockstub \
-    -I$(XPDIST)\public\jsurl    \
-    -I$(XPDIST)\public\certurl  \
-    -I$(XPDIST)\public\remoturl \
-    -I$(XPDIST)\public\marimurl \
-    -I$(XPDIST)\public\security 
-#!endif
-
-!endif
-
 include <$(DEPTH)\config\rules.mak> 
 
 !ifndef MODULAR_NETLIB

mozilla/network/cnvts/Makefile.in

@@ -42,14 +42,6 @@ CSRCS		= \
 	txview.c	\
 	$(NULL)
 
-ifndef MODULAR_NETLIB
-CSRCS += \
-	cvmime.c	\
-	cvpics.c	\
-	cvview.c	\
-	$(NULL)
-endif
-
 EXPORTS= \
     nsINetPlugin.h \
     nsINetPluginInstance.h \
@@ -67,13 +59,6 @@ EXPORTS= \
     cvunzip.h   \
     cvjscfg.h
 
-ifndef MODULAR_NETLIB
-EXPORTS += \
-    cvmime.h    \
-    cvpics.h    \
-    $(NULL)
-endif
-
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 REQUIRES	= network img lay layer util parse pref js \

mozilla/network/cnvts/makefile.win

@@ -50,9 +50,6 @@ OBJS=   \
 	.\$(OBJDIR)\cvjscfg.obj		\
 	.\$(OBJDIR)\txview.obj		\
 	.\$(OBJDIR)\cvmime.obj		\
-!ifndef MODULAR_NETLIB
-	.\$(OBJDIR)\cvpics.obj		\
-!endif
 	$(NULL)
 
 CPPSRCS = \
@@ -65,9 +62,6 @@ TMP_CSRCS =	\
 	cvchunk.c	\
 	cvcolor.c	\
 	cvmime.c	\
-!ifndef MODULAR_NETLIB
-	cvpics.c	\
-!endif
 	cvdisk.c	\
 	cvsimple.c	\
 	cvunzip.c	\

mozilla/network/main/Makefile.in

@@ -51,12 +51,6 @@ CPPSRCS	=	\
 	singsignStub.cpp	\
 	$(NULL)
 
-ifndef MODULAR_NETLIB
-CSRCS += \
-	mkinit.c	\
-	$(NULL)
-endif
-
 EXPORTS= mkstream.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
 	netstream.h mkselect.h mktcp.h netutils.h mkpadpac.h mkautocf.h mkhelp.h \
         mkutils.h mktrace.h net_xp_file.h mkprefs.h

mozilla/network/main/makefile.win

@@ -32,9 +32,7 @@ include <$(DEPTH)\config\config.mak>
 #   proper JS includes
 #
 LCFLAGS     = $(LCFLAGS) -DMOZILLA_CLIENT
-!ifdef MODULAR_NETLIB
 #LCFLAGS        = $(LCFLAGS) -DNO_NETWORK_POLLING
-!endif
 
 !ifdef BUILD_DEBUG_GC
 LCFLAGS     = $(LCFLAGS) -DDEBUG_GC
@@ -87,9 +85,6 @@ CSRCS = \
     mkselect.c  \
     mksockrw.c  \
     mksort.c    \
-!ifndef MODULAR_NETLIB
-    mkstream.c  \
-!endif
     mktrace.c   \
     mkutils.c   \
     prefetch.c  \

mozilla/network/makefile.win

@@ -36,10 +36,8 @@ DIRS= \
 	protocol \
 	cnvts \
 	client \
-!ifdef MODULAR_NETLIB
 	public \
 	module \
-!endif
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak> 

mozilla/network/protocol/Makefile.in

@@ -34,14 +34,6 @@ DIRS	= about	\
         sockstub \
 	$(NULL)
 
-ifndef MODULAR_NETLIB
-DIRS += \
-	dataurl	\
-	js	\
-	marimba	\
-	$(NULL)
-endif
-
 ifdef MOZ_LDAP
 DIRS += ldap \
 	$(NULL)

mozilla/network/protocol/makefile.win

@@ -38,11 +38,6 @@ DIRS= \
 !if defined(SMART_MAIL) 
     pop3 \
 !endif
-!ifndef MODULAR_NETLIB
-    dataurl \
-    js \
-    marimba \
-!endif
 !if defined(MOZ_MAIL_NEWS)
     smtp \
 !endif