Removing ApplicationShell interfaces from webshell. Will be moved to toplevel 'shell' in near future.

webshell/public/Makefile

@@ -20,11 +20,9 @@ DEPTH = ../..
 MODULE = raptor
 
 EXPORTS =			\
-	nsIApplicationShell.h	\
 	nsIDocumentWidget.h	\
 	nsILinkHandler.h	\
 	nsIWebWidget.h		\
-	nsIShellInstance.h		\
 	nsweb.h			\
 	$(NULL)
 

webshell/public/makefile.win

@@ -23,9 +23,7 @@ MODULE=raptor
 
 EXPORTS =			\
 	nsIDocumentWidget.h		\
-	nsIApplicationShell.h		\
 	nsILinkHandler.h	\
-	nsIShellInstance.h	\
 	nsIWebWidget.h		\
 	nsweb.h			\
 	$(NULL)

webshell/src/Makefile

@@ -23,15 +23,11 @@ DEFINES = -D_IMPL_NS_WEB
 
 CPPSRCS=				\
  nsLinkHandler.cpp			\
- nsShellInstance.cpp			\
- nsApplicationManager.cpp			\
  nsWebWidget.cpp			\
  $(NULL)
 
 CPP_OBJS=				\
  ./$(OBJDIR)/nsLinkHandler.o		\
- ./$(OBJDIR)/nsShellInstance.o		\
- ./$(OBJDIR)/nsApplicationManager.o		\
  ./$(OBJDIR)/nsWebWidget.o		\
  $(NULL)
 

webshell/src/makefile.win

@@ -18,26 +18,16 @@
 DEPTH=..\..
 IGNORE_MANIFEST=1
 
-DIRS = windows
-
 DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN
 MODULE=raptor 
 
-EXPORTS =			\
-	nsApplicationManager.h		\
-	$(NULL)
-
 CPPSRCS=				\
  nsLinkHandler.cpp			\
- nsShellInstance.cpp			\
- nsApplicationManager.cpp			\
  nsWebWidget.cpp			\
  $(NULL)
 
 CPP_OBJS=				\
  .\$(OBJDIR)\nsLinkHandler.obj		\
- .\$(OBJDIR)\nsShellInstance.obj		\
- .\$(OBJDIR)\nsApplicationManager.obj		\
  .\$(OBJDIR)\nsWebWidget.obj		\
  $(NULL)
 

webshell/tests/imgtest/makefile.win

@@ -17,7 +17,7 @@
 DEPTH=..\..\..
 
 MAKE_OBJ_TYPE	= EXE
-PROGRAM = .\$(OBJDIR)\nsImageTest.exe
+PROGRAM = .\$(OBJDIR)\ImageTest.exe
 RESFILE = image.res
 MAPFILE = image.map
 
@@ -26,15 +26,13 @@ LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\..\src
 LLFLAGS = $(LLFLAGS) /SUBSYSTEM:CONSOLE
 
 OBJS =                                  \
-	.\$(OBJDIR)\nsImageTest.obj         \
-	.\$(OBJDIR)\ImageTestImpl.obj         \
+	.\$(OBJDIR)\ImageTest.obj         \
 	$(NULL)
 
 LLIBS=				\
  $(DIST)\lib\raptorbase.lib		\
  $(DIST)\lib\raptorgfx.lib		\
  $(DIST)\lib\raptorweb.lib		\
- $(DIST)\lib\raptorwebwin_s.lib		\
  $(DIST)\lib\xpcom32.lib		\
  $(LIBNSPR)			\
  $(DIST)\lib\libplc21.lib		\
@@ -48,5 +46,5 @@ install:: $(PROGRAM)
 	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
 
 clobber::
-	rm -f $(DIST)\bin\nsImageTest.exe
+	rm -f $(DIST)\bin\ImageTest.exe