diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win index e293ebd2266..62ef7a9070d 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win @@ -47,4 +47,5 @@ include <$(DEPTH)\config\rules.mak> libs:: $(DLL) clobber:: - $(RM) -f *.sbr + $(RM) *.sbr + $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win index 9591afcca59..eb3b65a1e73 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win @@ -22,10 +22,42 @@ DEPTH=..\..\..\..\..\..\.. include <$(DEPTH)\config\config.mak> +MODULE = npscriptable + +XPIDLSRCS = \ + .\nsIScriptablePlugin.idl \ + $(NULL) + +MAKE_OBJ_TYPE = DLL +DLLNAME = npscriptable +RESFILE = npscriptable.res +DEFFILE = npscriptable.def +DLL=.\$(OBJDIR)\$(DLLNAME).dll + +CFLAGS = $(CFLAGS) -I..\..\include -I..\..\..\include + +OBJS = \ + .\$(OBJDIR)\plugin.obj \ + .\$(OBJDIR)\nsScriptablePeer.obj \ + $(NULL) + +LLIBS = \ + ..\..\common\$(OBJDIR)\plugingate.lib \ + $(NULL) + +WIN_LIBS = version.lib include <$(DEPTH)\config\rules.mak> -#libs:: $(DLL) +# don't forget to remove files exported by default +libs:: $(DLL) + $(RM) $(XPDIST)\idl\nsIScriptablePlugin.idl + $(RM) $(XPDIST)\include\nsIScriptablePlugin.h + $(RM) $(DIST)\bin\components\$(DLLNAME).xpt clobber:: - rm -f *.sbr + $(RM) *.sbr + $(RM) $(XPDIST)\idl\nsIScriptablePlugin.idl + $(RM) $(XPDIST)\include\nsIScriptablePlugin.h + $(RM) $(DIST)\bin\components\$(DLLNAME).xpt + $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win index 6ebc6a4e440..ad0024b2897 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win @@ -22,10 +22,42 @@ DEPTH=..\..\..\..\..\.. include <$(DEPTH)\config\config.mak> +MODULE = npsimple + +XPIDLSRCS = \ + .\nsISimplePlugin.idl \ + $(NULL) + +MAKE_OBJ_TYPE = DLL +DLLNAME = npsimple +RESFILE = npsimple.res +DEFFILE = npsimple.def +DLL=.\$(OBJDIR)\$(DLLNAME).dll + +CFLAGS = $(CFLAGS) -I..\include -I..\..\include + +OBJS = \ + .\$(OBJDIR)\plugin.obj \ + .\$(OBJDIR)\nsScriptablePeer.obj \ + $(NULL) + +LLIBS = \ + ..\common\$(OBJDIR)\plugingate.lib \ + $(NULL) + +WIN_LIBS = version.lib include <$(DEPTH)\config\rules.mak> -#libs:: $(DLL) +# don't forget to remove files exported by default +libs:: $(DLL) + $(RM) $(XPDIST)\idl\nsISimplePlugin.idl + $(RM) $(XPDIST)\include\nsISimplePlugin.h + $(RM) $(DIST)\bin\components\$(DLLNAME).xpt clobber:: - rm -f *.sbr + $(RM) *.sbr + $(RM) $(XPDIST)\idl\nsISimplePlugin.idl + $(RM) $(XPDIST)\include\nsISimplePlugin.h + $(RM) $(DIST)\bin\components\$(DLLNAME).xpt + $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll