From 92694300d0f26d48185a035def9e02dfc532368e Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Sun, 29 Sep 2002 02:45:06 +0000 Subject: [PATCH] Bug 166417 -- Plugin SDK does not build, not part of the build process git-svn-id: svn://10.0.0.236/trunk@130706 18797224-902f-48f8-a5cc-f745e15eee43 --- .../sdk/samples/{makefile.win => Makefile.in} | 16 +++-- .../windows/{makefile.win => Makefile.in} | 45 ++++++------- .../common/{makefile.win => Makefile.in} | 33 +++++----- .../samples/scriptable/windows/Makefile.in | 49 +++++++++++++++ .../samples/scriptable/windows/makefile.win | 63 ------------------- .../tools/sdk/samples/simple/Makefile.in | 16 +++-- .../tools/sdk/samples/simple/makefile.win | 63 ------------------- .../windows/{makefile.win => Makefile.in} | 45 ++++++------- 8 files changed, 124 insertions(+), 206 deletions(-) rename mozilla/modules/plugin/tools/sdk/samples/{makefile.win => Makefile.in} (73%) rename mozilla/modules/plugin/tools/sdk/samples/basic/windows/{makefile.win => Makefile.in} (63%) rename mozilla/modules/plugin/tools/sdk/samples/common/{makefile.win => Makefile.in} (60%) create mode 100644 mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in delete mode 100644 mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win delete mode 100644 mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win rename mozilla/modules/plugin/tools/sdk/samples/winless/windows/{makefile.win => Makefile.in} (63%) diff --git a/mozilla/modules/plugin/tools/sdk/samples/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/Makefile.in similarity index 73% rename from mozilla/modules/plugin/tools/sdk/samples/makefile.win rename to mozilla/modules/plugin/tools/sdk/samples/Makefile.in index 186f03e0377..b1bbafc5466 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/Makefile.in @@ -1,4 +1,3 @@ -#!nmake # # The contents of this file are subject to the Netscape Public # License Version 1.1 (the "License"); you may not use this file @@ -19,8 +18,17 @@ # # Contributor(s): -DEPTH=..\..\..\..\..\ +DEPTH = ../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -DIRS= common basic\windows scriptable\windows simple winless\windows +include $(DEPTH)/config/autoconf.mk -include <$(DEPTH)\config\rules.mak> +DIRS = common simple + +ifeq ($(OS_ARCH),WINNT) +DIRS += basic/windows scriptable/windows winless/windows +endif + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in similarity index 63% rename from mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win rename to mozilla/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in index 62ef7a9070d..e199a9245af 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in @@ -1,4 +1,3 @@ -#!nmake # # The contents of this file are subject to the Netscape Public # License Version 1.1 (the "License"); you may not use this file @@ -19,33 +18,27 @@ # # Contributor(s): -DEPTH=..\..\..\..\..\..\.. -include <$(DEPTH)\config\config.mak> +DEPTH = ../../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -MODULE=npbasic +include $(DEPTH)/config/autoconf.mk + +XPIDL_MODULE = npbasic +LIBRARY_NAME = npbasic + +NO_DIST_INSTALL = 1 + +CPPSRCS = plugin.cpp + +SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX) -MAKE_OBJ_TYPE = DLL -DLLNAME = npbasic -RESFILE = basic.res DEFFILE = basic.def -DLL=.\$(OBJDIR)\$(DLLNAME).dll +RESFILE = basic.res -CFLAGS = $(CFLAGS) -I..\..\include -I..\..\..\include +include $(topsrcdir)/config/rules.mk -OBJS = \ - .\$(OBJDIR)\plugin.obj \ - $(NULL) - -LLIBS = \ - ..\..\common\$(OBJDIR)\plugingate.lib \ - $(NULL) - -WIN_LIBS = version.lib - -include <$(DEPTH)\config\rules.mak> - -libs:: $(DLL) - -clobber:: - $(RM) *.sbr - $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll +LOCAL_INCLUDES = -I$(srcdir)/../../include \ + -I$(srcdir)/../../../include \ + $(NULL) diff --git a/mozilla/modules/plugin/tools/sdk/samples/common/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/common/Makefile.in similarity index 60% rename from mozilla/modules/plugin/tools/sdk/samples/common/makefile.win rename to mozilla/modules/plugin/tools/sdk/samples/common/Makefile.in index bbd8a2bb633..b18be81daae 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/common/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/common/Makefile.in @@ -1,4 +1,3 @@ -#!nmake # # The contents of this file are subject to the Netscape Public # License Version 1.1 (the "License"); you may not use this file @@ -19,26 +18,24 @@ # # Contributor(s): -DEPTH=..\..\..\..\..\.. -include <$(DEPTH)\config\config.mak> +DEPTH = ../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -MAKE_OBJ_TYPE = LIB -LIBRARY_NAME = plugingate -LIB=.\$(OBJDIR)\$(LIBRARY_NAME).lib +include $(DEPTH)/config/autoconf.mk -CFLAGS = $(CFLAGS) -I..\include -I..\..\include +LIBRARY_NAME = plugingate_s -OBJS = \ - .\$(OBJDIR)\npn_gate.obj \ - .\$(OBJDIR)\npp_gate.obj \ - .\$(OBJDIR)\np_entry.obj \ - $(NULL) +NO_DIST_INSTALL = 1 -include <$(DEPTH)\config\rules.mak> +CPPSRCS = npn_gate.cpp \ + npp_gate.cpp \ + np_entry.cpp \ + $(NULL) -# 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 +FORCE_STATIC_LIB = 1 -clobber:: - $(RM) *.sbr +include $(topsrcdir)/config/rules.mk + +LOCAL_INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in new file mode 100644 index 00000000000..6f310c81190 --- /dev/null +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in @@ -0,0 +1,49 @@ +# +# 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 = ../../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +XPIDL_MODULE = npscriptable +LIBRARY_NAME = npscriptable + +NO_DIST_INSTALL = 1 + +CPPSRCS = plugin.cpp \ + nsScriptablePeer.cpp \ + $(NULL) + +XPIDLSRCS = nsIScriptablePluginSample.idl + +SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX) + +DEFFILE = npscriptable.def +RESFILE = npscriptable.res + +include $(topsrcdir)/config/rules.mk + +LOCAL_INCLUDES = -I$(srcdir)/$(XPIDL_GEN_DIR) \ + -I$(srcdir)/../../include \ + -I$(srcdir)/../../../include \ + $(NULL) diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win deleted file mode 100644 index eb3b65a1e73..00000000000 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/makefile.win +++ /dev/null @@ -1,63 +0,0 @@ -#!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> - -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> - -# 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) *.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.in b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in index 53479ddf2b2..0e77e128927 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in @@ -29,18 +29,19 @@ include $(DEPTH)/config/autoconf.mk XPIDL_MODULE = npsimple LIBRARY_NAME = npsimple -BUILD_STATIC_LIBS = 1 +NO_DIST_INSTALL = 1 -CPPSRCS = nsScriptablePeer.cpp plugin.cpp +CPPSRCS = nsScriptablePeer.cpp \ + plugin.cpp \ + $(NULL) XPIDLSRCS = nsISimplePlugin.idl -SHARED_LIBRARY_LIBS = ../common/psdkplugingate_s.$(LIB_SUFFIX) +SHARED_LIBRARY_LIBS = ../common/plugingate_s.$(LIB_SUFFIX) ifeq ($(OS_ARCH),WINNT) -DEFFILE = $(srcdir)/npsimple.def +DEFFILE = npsimple.def RESFILE = npsimple.res -OS_LIBS = version.lib endif include $(topsrcdir)/config/rules.mk @@ -49,4 +50,7 @@ ifeq ($(OS_ARCH),Linux) EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt endif -LOCAL_INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include +LOCAL_INCLUDES = -I$(srcdir)/$(XPIDL_GEN_DIR) \ + -I$(srcdir)/../include \ + -I$(srcdir)/../../include \ + $(NULL) diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win deleted file mode 100644 index ad0024b2897..00000000000 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/makefile.win +++ /dev/null @@ -1,63 +0,0 @@ -#!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> - -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> - -# 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) *.sbr - $(RM) $(XPDIST)\idl\nsISimplePlugin.idl - $(RM) $(XPDIST)\include\nsISimplePlugin.h - $(RM) $(DIST)\bin\components\$(DLLNAME).xpt - $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll diff --git a/mozilla/modules/plugin/tools/sdk/samples/winless/windows/makefile.win b/mozilla/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in similarity index 63% rename from mozilla/modules/plugin/tools/sdk/samples/winless/windows/makefile.win rename to mozilla/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in index ac9ee8568ba..faddcef1520 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/winless/windows/makefile.win +++ b/mozilla/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in @@ -1,4 +1,3 @@ -#!nmake # # The contents of this file are subject to the Netscape Public # License Version 1.1 (the "License"); you may not use this file @@ -19,33 +18,27 @@ # # Contributor(s): -DEPTH=..\..\..\..\..\..\.. -include <$(DEPTH)\config\config.mak> +DEPTH = ../../../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ -MODULE=npwinless +include $(DEPTH)/config/autoconf.mk + +XPIDL_MODULE = npwinless +LIBRARY_NAME = npwinless + +NO_DIST_INSTALL = 1 + +CPPSRCS = plugin.cpp + +SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX) -MAKE_OBJ_TYPE = DLL -DLLNAME = npwinless -RESFILE = npwinless.res DEFFILE = npwinless.def -DLL=.\$(OBJDIR)\$(DLLNAME).dll +RESFILE = npwinless.res -CFLAGS = $(CFLAGS) -I..\..\include -I..\..\..\include +include $(topsrcdir)/config/rules.mk -OBJS = \ - .\$(OBJDIR)\plugin.obj \ - $(NULL) - -LLIBS = \ - ..\..\common\$(OBJDIR)\plugingate.lib \ - $(NULL) - -WIN_LIBS = version.lib - -include <$(DEPTH)\config\rules.mak> - -libs:: $(DLL) - -clobber:: - $(RM) *.sbr - $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll +LOCAL_INCLUDES = -I$(srcdir)/../../include \ + -I$(srcdir)/../../../include \ + $(NULL)