From 408694fccd6cd5e88ccfa6eeddfcfb72a2131abd Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Wed, 7 Feb 2001 03:09:15 +0000 Subject: [PATCH] now building embedding components git-svn-id: svn://10.0.0.236/trunk@86447 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 5 ++ mozilla/embedding/components/Makefile.in | 29 +++++++++ .../embedding/components/build/Makefile.in | 63 +++++++++++++++++++ .../components/windowwatcher/Makefile.in | 29 +++++++++ .../windowwatcher/public/Makefile.in | 37 +++++++++++ .../components/windowwatcher/src/Makefile.in | 40 ++++++++++++ mozilla/embedding/makefile.win | 2 +- 7 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 mozilla/embedding/components/Makefile.in create mode 100644 mozilla/embedding/components/build/Makefile.in create mode 100644 mozilla/embedding/components/windowwatcher/Makefile.in create mode 100644 mozilla/embedding/components/windowwatcher/public/Makefile.in create mode 100644 mozilla/embedding/components/windowwatcher/src/Makefile.in diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index ee1920d1949..695d5a372cb 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -700,6 +700,11 @@ embedding/browser/gtk/tests/Makefile embedding/browser/photon/Makefile embedding/browser/photon/src/Makefile embedding/browser/photon/tests/Makefile +embedding/components/Makefile +embedding/components/build/Makefile +embedding/components/windowwatcher/Makefile +embedding/components/windowwatcher/public/Makefile +embedding/components/windowwatcher/src/Makefile embedding/config/Makefile embedding/tests/gtkEmbed/Makefile " diff --git a/mozilla/embedding/components/Makefile.in b/mozilla/embedding/components/Makefile.in new file mode 100644 index 00000000000..c21533e9635 --- /dev/null +++ b/mozilla/embedding/components/Makefile.in @@ -0,0 +1,29 @@ +# +# The contents of this file are subject to the Mozilla 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/MPL/ +# +# 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, Inc. Portions created by Netscape are +# Copyright (C) 2001, Mozilla. All Rights Reserved. +# +# Contributor(s): + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DIRS = windowwatcher build + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in new file mode 100644 index 00000000000..6b9ddb2ba91 --- /dev/null +++ b/mozilla/embedding/components/build/Makefile.in @@ -0,0 +1,63 @@ +# The contents of this file are subject to the Mozilla 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/MPL/ +# +# 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, Inc. Portions created by Netscape are +# Copyright (C) 2001, Mozilla. All Rights Reserved. +# +# Contributor(s): + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = embedcomponents +LIBRARY_NAME = embedcomponents +IS_COMPONENT = 1 +REQUIRES = xpcom windowwatcher_s + +CPPSRCS = nsModule.cpp + +ifeq ($(MOZ_WIDGET_TOOLKIT),os2) +EXTRA_DSO_LIBS = windowwatcher_s + +ifdef MOZ_PERF_METRICS +EXTRA_DSO_LIBS += mozutil_s +endif + +else + +SHARED_LIBRARY_LIBS = \ + $(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \ + $(NULL) + +ifdef MOZ_PERF_METRICS +SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) +endif + +endif + +LOCAL_INCLUDES = \ + -I$(srcdir)/../windowwatcher/src \ + $(NULL) + +EXTRA_DSO_LDOPTS = \ + $(EXTRA_DSO_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NULL) + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/embedding/components/windowwatcher/Makefile.in b/mozilla/embedding/components/windowwatcher/Makefile.in new file mode 100644 index 00000000000..fb4382806d9 --- /dev/null +++ b/mozilla/embedding/components/windowwatcher/Makefile.in @@ -0,0 +1,29 @@ +# +# The contents of this file are subject to the Mozilla 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/MPL/ +# +# 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, Inc. Portions created by Netscape are +# Copyright (C) 2001, Mozilla. All Rights Reserved. +# +# Contributor(s): + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DIRS = public src + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/windowwatcher/public/Makefile.in b/mozilla/embedding/components/windowwatcher/public/Makefile.in new file mode 100644 index 00000000000..1bbb545b6a3 --- /dev/null +++ b/mozilla/embedding/components/windowwatcher/public/Makefile.in @@ -0,0 +1,37 @@ +# +# 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) 2001 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = windowwatcher +XPIDL_MODULE = windowwatcher + +XPIDLSRCS = nsIWindowWatcher.idl \ + nsPIWindowWatcher.idl \ + $(NULL) + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/embedding/components/windowwatcher/src/Makefile.in b/mozilla/embedding/components/windowwatcher/src/Makefile.in new file mode 100644 index 00000000000..6413bf931fe --- /dev/null +++ b/mozilla/embedding/components/windowwatcher/src/Makefile.in @@ -0,0 +1,40 @@ +# +# The contents of this file are subject to the Mozilla 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/MPL/ +# +# 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, Inc. Portions created by Netscape are +# Copyright (C) 2001, Mozilla. All Rights Reserved. +# +# Contributor(s): + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = embedcomponents +LIBRARY_NAME = windowwatcher_s +# REQUIRES = xpcom rdf mork pref js profile necko + +CPPSRCS = nsWindowWatcher.cpp \ + $(NULL) + +# we don't want the shared lib, but we want to force the creation of a +# static lib. +override NO_SHARED_LIB=1 +override NO_STATIC_LIB= + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/embedding/makefile.win b/mozilla/embedding/makefile.win index a42466fdf7c..6bd041530a4 100644 --- a/mozilla/embedding/makefile.win +++ b/mozilla/embedding/makefile.win @@ -21,6 +21,6 @@ DEPTH=.. -DIRS=base browser tests +DIRS=base components browser tests include <$(DEPTH)\config\rules.mak>