Changes required to build on linux. NPODB

minimo/base/Makefile.in

@@ -1,32 +1,40 @@
 # ***** BEGIN LICENSE BLOCK *****
-# Version: Mozilla-sample-code 1.0
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
-# Copyright (c) 2002 Netscape Communications Corporation and
-# other contributors
+# 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/
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this Mozilla sample software and associated documentation files
-# (the "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to permit
-# persons to whom the Software is furnished to do so, subject to the
-# following conditions:
+# 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 above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# The Original Code is Minimo.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# The Initial Developer of the Original Code is
+# Doug Turner <dougt@meer.net>.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
 # ***** END LICENSE BLOCK *****
 
+
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
@@ -63,17 +71,17 @@ REQUIRES	= xpcom \
 		      embedcomponents		 \
 		      appcomps				 \
 		      phone					 \
-		  $(NULL)
+		      $(NULL)				 \
 
-CPPSRCS		= \
-		Minimo.cpp \
+CPPSRCS	    = Minimo.cpp		  \
 		      WindowCreator.cpp	  \
 		      SplashScreen.cpp	  \
 		      nsConsoleWriter.cpp \
-	    $(NULL)
+	          $(NULL)			  \
 
 
 # this should move into the toolkit!
+LOCAL_INCLUDES	= -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
 CPPSRCS    += nsBrowserStatusFilter.cpp
 
 ifdef WINCE
@@ -82,15 +90,18 @@ endif
 
 EXTRA_DSO_LIBS	= embed_base_s profdirserviceprovider_s
 
-LIBS		= \
-		$(EXTRA_DSO_LIBS) \
+LIBS	  = $(EXTRA_DSO_LIBS)		\
 			$(MOZ_UNICHARUTIL_LIBS)	\
 			$(XPCOM_LIBS)			\
 			$(NSPR_LIBS)			\
 			$(MOZ_JS_LIBS)			\
 			$(NULL)
 
-LOCAL_INCLUDES	= -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
+ifdef MOZ_ENABLE_GTK2
+LIBS	 += $(XLDFLAGS)	\
+		 	$(XLIBS)	\
+			$(NULL)
+endif
 
 include $(topsrcdir)/config/config.mk
 
@@ -99,11 +110,18 @@ LOCAL_INCLUDES	+= -I$(srcdir)/wince
 OS_LIBS += $(call EXPAND_LIBNAME, aygshell cellcore)
 endif
 
+
 ifdef BUILD_STATIC_LIBS
 
-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/minimo-link-comps
-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/minimo-link-names
-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/minimo-link-libs
+ifdef WINCE
+FINAL_PLATFORM=wince
+else
+FINAL_PLATFORM=linux
+endif
+
+FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
+FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
+FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
 
 include $(topsrcdir)/config/static-config.mk
 
@@ -118,16 +136,24 @@ endif # BUILD_STATIC_LIBS
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_ENABLE_GTK2
+CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+EXTRA_LIBS	+= $(TK_LIBS)
+endif
+
 ifdef BUILD_STATIC_LIBS
-
 include $(topsrcdir)/config/static-rules.mk
-
-endif # BUILD_STATIC_LIBS
+endif
 
 export::
 	$(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
 
 GARBAGE += nsBrowserStatusFilter.cpp
 
+ifdef WINCE
 installer::
 	bash $(srcdir)/../config/wince_package.sh  $(MOZ_BUILD_ROOT) $(srcdir)
+else
+installer::
+	bash $(srcdir)/../config/linux_package.sh  $(MOZ_BUILD_ROOT) $(srcdir)
+endif

minimo/base/linux/minimo-link-comps

@@ -0,0 +1,33 @@
+xpconnect
+uconv
+i18n
+necko
+necko2
+jar50
+pref
+caps
+rdf
+htmlpars
+gfx_gtk
+imglib2
+gkplugin
+widget_gtk2
+gklayout
+docshell
+embedcomponents
+webbrwsr
+editor
+txmgr
+nsappshell
+chrome
+mork
+toolkitcomps
+pipboot
+pipnss
+pippki
+xmlextras
+transformiix
+websrvcs
+snav
+phone
+softkey

minimo/base/linux/minimo-link-libs

@@ -0,0 +1,5 @@
+unicharutil_s
+ucvutil_s
+gtkxtbin
+gfxshared_s
+gkgfx

minimo/base/linux/minimo-link-names

@@ -0,0 +1,33 @@
+xpconnect
+nsUConvModule
+nsI18nModule
+necko_core_and_primary_protocols
+necko_secondary_protocols
+nsJarModule
+nsPrefModule
+nsSecurityManagerModule
+nsRDFModule
+nsParserModule
+nsGfxGTKModule
+nsImageLib2Module
+nsPluginModule
+nsWidgetGtk2Module
+nsLayoutModule
+docshell_provider
+embedcomponents
+Browser_Embedding_Module
+nsEditorModule
+nsTransactionManagerModule
+appshell
+nsChromeModule
+nsMorkModule
+nsToolkitCompsModule
+BOOT
+NSS
+PKI
+nsXMLExtrasModule
+TransformiixModule
+nsWebServicesModule
+SpatialNavigationModule
+nsPhoneSupportModule
+SoftKeyBoardModule

minimo/base/wince/minimo-link-comps

@@ -0,0 +1,32 @@
+xpconect
+mozuconv
+i18n
+necko
+jar50
+rdf
+pref
+caps
+gkparser
+gkgfxwin
+imglib2
+gkwidget
+gklayout
+docshell
+embedcmp
+webbrwsr
+texteditor
+txmgr
+appshell
+chrome
+mork
+tkitcmps
+xmlextra
+t8iix
+websrvcs
+gkplugin
+softkey
+pipboot
+pipnss
+pippki
+phone
+snav

minimo/base/wince/minimo-link-libs

@@ -0,0 +1,4 @@
+unicharutil_s
+ucvutil_s
+gfxshared_s
+gkgfx

minimo/base/wince/minimo-link-names

@@ -0,0 +1,32 @@
+xpconnect
+nsUConvModule
+nsI18nModule
+necko_core_and_primary_protocols
+nsJarModule
+nsPrefModule
+nsSecurityManagerModule
+nsRDFModule
+nsParserModule
+nsGfxModule
+nsImageLib2Module
+nsPluginModule
+nsWidgetModule
+nsLayoutModule
+docshell_provider
+embedcomponents
+Browser_Embedding_Module
+nsEditorModule
+nsTransactionManagerModule
+appshell
+nsChromeModule
+nsMorkModule
+nsToolkitCompsModule
+nsXMLExtrasModule
+TransformiixModule
+nsWebServicesModule
+SoftKeyBoardModule
+BOOT
+NSS
+PKI
+nsPhoneSupportModule
+SpatialNavigationModule