Sync'd Makefile.ins

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

mozilla/cmd/stubfe/Makefile.in

@@ -59,7 +59,6 @@ REQUIRES	= \
 
 CSRCS = \
 	main.c \
-	stubbm.c \
 	stubctxt.c \
 	stubdlgs.c \
 	stubedit.c \

mozilla/cmd/xfe/Makefile.in

@@ -81,6 +81,7 @@ DIRS		= \
 REQUIRES	=\
 			XfeWidgets \
 			XfeBm \
+			XfeToolBar \
 			Microline \
 		  addr \
 		  applet \
@@ -245,9 +246,12 @@ GARBAGE		+= e_kit_resources.h cxxlink-filter
 
 ICONS_LIB	= $(DIST)/lib/lib$(LITE_PREFIX)xfeicons.a
 
-DTWIDGETS_LIB		= $(DIST)/lib/libDtWidgets.a
-XFE_WIDGETS_LIB		= $(DIST)/lib/libXfeWidgets.a
-XFE_WIDGETS_BM_LIB	= $(DIST)/lib/libXfeBm.a
+DTWIDGETS_LIB				= $(DIST)/lib/libDtWidgets.a
+XFE_WIDGETS_LIB				= $(DIST)/lib/libXfeWidgets.a
+XFE_WIDGETS_BM_LIB			= $(DIST)/lib/libXfeBm.a
+XFE_WIDGETS_COMBO_BOX_LIB	= $(DIST)/lib/libXfeComboBox.a
+XFE_WIDGETS_CAPTION_LIB		= $(DIST)/lib/libXfeCaption.a
+XFE_WIDGETS_TOOL_BAR_LIB	= $(DIST)/lib/libXfeToolBar.a
 
 ifneq ($(OS_ARCH),IRIX) 
 ifneq ($(OS_ARCH),FreeBSD)
@@ -297,6 +301,7 @@ BASIC_LIBS	= \
 		  $(ICONS_LIB) \
 		  $(DTWIDGETS_LIB) \
 		  $(XFE_WIDGETS_BM_LIB) \
+		  $(XFE_WIDGETS_TOOL_BAR_LIB) \
 		  $(XFE_WIDGETS_LIB) \
 		  $(DIST)/lib/libxlate.a \
 		  $(DIST)/lib/libmimetype.a \
@@ -556,8 +561,8 @@ endif
 
 ifndef NO_MOCHA
 # XXX To a DSO...
-ifdef FULL_STATIC_BUILD
-BASIC_LIBS      += $(DIST)/lib/libjs.a
+ifndef FULL_STATIC_BUILD
+BASIC_LIBS      += $(DIST)/lib/libjs.a 
 ifdef JAVA_OR_OJI
 BASIC_LIBS	+= $(DIST)/lib/libjsj.a
 endif
@@ -1101,6 +1106,7 @@ OTHER_LIBS		= $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
 OTHER_DYN_MOTIF_LIBS	= $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
 endif
 
+
 #######################################################################
 
 $(MICROLINE_LIB):
@@ -1118,6 +1124,15 @@ $(XFE_WIDGETS_LIB):
 $(XFE_WIDGETS_BM_LIB):
 	cd XfeWidgets/XfeBm; $(MAKE)
 
+$(XFE_WIDGETS_COMBO_BOX_LIB):
+	cd XfeWidgets/XfeComboBox; $(MAKE)
+
+$(XFE_WIDGETS_CAPTION_LIB):
+	cd XfeWidgets/XfeCaption; $(MAKE)
+
+$(XFE_WIDGETS_TOOL_BAR_LIB):
+	cd XfeWidgets/XfeToolBar; $(MAKE)
+
 $(XFE2_LIB):
 	cd src; $(MAKE)
 

mozilla/modules/plugin/base/src/Makefile.in

@@ -30,7 +30,8 @@ LIBRARY_NAME=raptorplugin
 
 EXPORTS =	\
     nsPluginsCID.h  \
-	nsIPluginHost.h
+	nsIPluginHost.h \
+	nsIPluginInstanceOwner.h
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
@@ -51,6 +52,6 @@ LCFLAGS =-D_IMPL_NS_PLUGIN
 
 TARGETS = $(LIBRARY)
 
-INCLUDES += -I$(srcdir)/.
+INCLUDES += -I$(srcdir)/
 
 include $(topsrcdir)/config/rules.mk

mozilla/modules/plugin/nglsrc/Makefile.in

@@ -30,7 +30,8 @@ LIBRARY_NAME=raptorplugin
 
 EXPORTS =	\
     nsPluginsCID.h  \
-	nsIPluginHost.h
+	nsIPluginHost.h \
+	nsIPluginInstanceOwner.h
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
@@ -51,6 +52,6 @@ LCFLAGS =-D_IMPL_NS_PLUGIN
 
 TARGETS = $(LIBRARY)
 
-INCLUDES += -I$(srcdir)/.
+INCLUDES += -I$(srcdir)/
 
 include $(topsrcdir)/config/rules.mk

mozilla/network/module/Makefile.in

@@ -35,6 +35,8 @@ CPPSRCS			= \
 			  nsStubContext.cpp   \
 			  nsNetStubs.cpp      \
 			  nsNetIDs.cpp        \
+              nsLoadAttribs.cpp   \
+              nsNetFactory.cpp    \
 			  $(NULL)
 
 REQUIRES		= raptor js dbm nspr security pref xpcom util img \
@@ -50,7 +52,8 @@ EXPORTS = nsIStreamListener.h           \
           nsIHttpUrl.h                  \
           nsINetContainerApplication.h  \
           nsIRefreshUrl.h               \
-	  nsIConnectionInfo.h		\
+	      nsIConnectionInfo.h		\
+          nsILoadAttribs.h          \
           $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))