From 763a1cae1adbde2ac826f4128ef7a1becc005072 Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com>
Date: Sun, 2 Dec 2001 23:39:03 +0000
Subject: [PATCH] Preparing the Plugin SDK to become a part of the build, it is
 not yet.

---
 modules/plugin/tools/sdk/makefile.win         |  6 +--
 .../sdk/samples/basic/windows/makefile.win    | 33 +++++++-------
 .../tools/sdk/samples/common/makefile.win     | 44 +++++++++++++++++++
 modules/plugin/tools/sdk/samples/makefile.win |  2 +-
 4 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 modules/plugin/tools/sdk/samples/common/makefile.win

diff --git a/modules/plugin/tools/sdk/makefile.win b/modules/plugin/tools/sdk/makefile.win
index 62904788625..4988d9a7e77 100644
--- a/modules/plugin/tools/sdk/makefile.win
+++ b/modules/plugin/tools/sdk/makefile.win
@@ -26,9 +26,9 @@ DIRS = samples
 include <$(DEPTH)\config\rules.mak>
 
 export::
-  if not exist "bin" mkdir "bin"
-  if not exist "idl" mkdir "idl"
-  if not exist "include" mkdir "include"
+  if not exist "bin" MKDIR "bin"
+  if not exist "idl" MKDIR "idl"
+  if not exist "include" MKDIR "include"
 
   $(MAKE_INSTALL) $(XPDIST)\idl\nsISupports.idl .\idl
   $(MAKE_INSTALL) $(XPDIST)\idl\nsrootidl.idl .\idl
diff --git a/modules/plugin/tools/sdk/samples/basic/windows/makefile.win b/modules/plugin/tools/sdk/samples/basic/windows/makefile.win
index 7747281bba0..e293ebd2266 100644
--- a/modules/plugin/tools/sdk/samples/basic/windows/makefile.win
+++ b/modules/plugin/tools/sdk/samples/basic/windows/makefile.win
@@ -22,28 +22,29 @@
 DEPTH=..\..\..\..\..\..\..
 include <$(DEPTH)\config\config.mak>
 
-#MODULE=npbasic
+MODULE=npbasic
 
-#MAKE_OBJ_TYPE	= DLL
-#DLLNAME = npbasic
-#RESFILE = basic.res
-#DEFFILE = basic.def
-#DLL=.\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE	= DLL
+DLLNAME = npbasic
+RESFILE = basic.res
+DEFFILE = basic.def
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
-#LCFLAGS = $(LCFLAGS) -I..\..\include -I..\..\..\include
+CFLAGS = $(CFLAGS) -I..\..\include -I..\..\..\include
 
-#OBJS = \
-#  .\$(OBJDIR)\npn_gate.obj \
-#  .\$(OBJDIR)\npp_gate.obj \
-#  .\$(OBJDIR)\np_entry.obj \
-#  .\$(OBJDIR)\plugin.obj \
-#  $(NULL)
+OBJS = \
+  .\$(OBJDIR)\plugin.obj \
+  $(NULL)
 
-#WIN_LIBS = version.lib
+LLIBS = \
+  ..\..\common\$(OBJDIR)\plugingate.lib \
+  $(NULL)
+
+WIN_LIBS = version.lib
 
 include <$(DEPTH)\config\rules.mak>
 
-#libs:: $(DLL)
+libs:: $(DLL)
 
 clobber::
-	rm -f *.sbr
+	$(RM) -f *.sbr
diff --git a/modules/plugin/tools/sdk/samples/common/makefile.win b/modules/plugin/tools/sdk/samples/common/makefile.win
new file mode 100644
index 00000000000..38f08daec6f
--- /dev/null
+++ b/modules/plugin/tools/sdk/samples/common/makefile.win
@@ -0,0 +1,44 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..\..
+include <$(DEPTH)\config\config.mak>
+
+MAKE_OBJ_TYPE	= LIB
+LIBRARY_NAME = plugingate
+LIB=.\$(OBJDIR)\$(LIBRARY_NAME).lib
+
+CFLAGS = $(CFLAGS) -I..\include -I..\..\include
+
+CPP_OBJS = \
+  .\$(OBJDIR)\npn_gate.obj \
+  .\$(OBJDIR)\npp_gate.obj \
+  .\$(OBJDIR)\np_entry.obj \
+  $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+# it will export the lib to the dist/lib dir, so do not forget to remove it
+libs:: $(LIB)
+  $(RM) $(DIST)\lib\$(LIBRARY_NAME).lib
+
+clobber::
+	$(RM) *.sbr
diff --git a/modules/plugin/tools/sdk/samples/makefile.win b/modules/plugin/tools/sdk/samples/makefile.win
index 0d47a0439c0..f8ba2b026ef 100644
--- a/modules/plugin/tools/sdk/samples/makefile.win
+++ b/modules/plugin/tools/sdk/samples/makefile.win
@@ -21,6 +21,6 @@
 
 DEPTH=..\..\..\..\..\
 
-DIRS= basic\windows scriptable\windows simple
+DIRS= common basic\windows scriptable\windows simple
 
 include <$(DEPTH)\config\rules.mak>