3d7dee72f2
Author: Ron Capelli <capelli@acm.org>
The following files are updated to allow use of IBM Java 1.3.x
JVMs on Linux. Instead of statically linking libjawt.lib, the
code now dynamically links libjawt.so and then libawt.so only
if needed (similar to previous change for win32). It should
work on Solaris, but we couldn't test that here.
mozilla/java/webclient/src_moz/Makefile.in
mozilla/java/webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp
The following files are changed to support the ant 'clean'
target for src_ie.
mozilla/java/webclient/build.xml
mozilla/java/webclient/src_ie/Makefile.in
The following files are changed to disable the CurrentPage(2)
interface for IE, since it will be a while before that can be
made to work. With these changes, IE embeds smoothly with
Navigation and History interfaces working nicely to some degree.
mozilla/java/webclient/src_ie/WrapperFactoryImpl.cpp
mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
The following file is changed so that it does not depend on
Mozilla, allowing it to be shared cleanly for IE.
mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp
The following file is changed to correct the list of makefiles
that need to be configured for Webclient.
mozilla/java/makefiles
Finally, please delete the following files from CVS.
mozilla/java/webclient/src_ie/build.xml
mozilla/java/webclient/src_ie/Makefile.win
git-svn-id: svn://10.0.0.236/trunk@142382 18797224-902f-48f8-a5cc-f745e15eee43
194 lines
4.4 KiB
Makefile
194 lines
4.4 KiB
Makefile
# 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 Sun Microsystems,
|
|
# Inc. Portions created by Sun are
|
|
# Copyright (C) 1999 Sun Microsystems, Inc. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s):
|
|
|
|
DEPTH = ../../..
|
|
topsrcdir = @top_srcdir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
|
|
# IMPORTANT: on Linux, if building webclient with a non-debug mozilla
|
|
# tree, the libwidget_gtk.so binary produced will not work with
|
|
# webclient. Namely, the symbol handle_gdk_event__FP9_GdkEventPv will
|
|
# be defined locally, not globaly, as is required. For the webclient
|
|
# 1.0 release, we're going to bundle a libwidget_gtk.so with the xpi.
|
|
# If you want to do a non-debug build of your own, you must make sure
|
|
# yor libwidget_gtk.so is linked without these options:
|
|
|
|
# -DNDEBUG -DTRIMMED
|
|
|
|
# and with these options
|
|
|
|
# -DNDEBUG -DDEBUG_edburns
|
|
|
|
# If your libwidget_gtk.so has this symbol:
|
|
|
|
# 0003b2d0 T handle_gdk_event__FP9_GdkEventPv
|
|
|
|
# with the capital T, you're ok. The version of libwidget_gtk.so used
|
|
# in the webclient 1.0 bundle is available at:
|
|
# <http://www.mozilla.org/projects/blackwood/webclient/bin/1.0/libwidget_gtk.so>.
|
|
# to build WEBCLIENT_PACKAGE_BUILD on linux, grab libwidget_gtk.so from
|
|
# the above URL and put it in the same directory as this file.
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
LIBRARY_NAME = webclient_bal
|
|
else
|
|
LIBRARY_NAME = webclient
|
|
endif
|
|
|
|
REQUIRES = xpcom \
|
|
layout \
|
|
shistory \
|
|
find \
|
|
appcomps \
|
|
appshell \
|
|
pref \
|
|
locale \
|
|
intl \
|
|
rdf \
|
|
bookmarks \
|
|
content \
|
|
editor \
|
|
string \
|
|
embed_base \
|
|
webBrowser_core \
|
|
webbrwsr \
|
|
webshell \
|
|
windowwatcher \
|
|
profile \
|
|
necko \
|
|
docshell \
|
|
dom \
|
|
widget \
|
|
uriloader \
|
|
webbrowserpersist \
|
|
gfx \
|
|
gtkembedmoz \
|
|
$(NULL)
|
|
|
|
CPPSRCS = \
|
|
ns_util.cpp \
|
|
ns_util_export.cpp \
|
|
dom_util.cpp \
|
|
nsActions.cpp \
|
|
rdf_util.cpp \
|
|
BookmarksImpl.cpp \
|
|
CBrowserContainer.cpp \
|
|
PromptActionEvents.cpp \
|
|
CurrentPageImpl.cpp \
|
|
CurrentPageActionEvents.cpp \
|
|
HistoryImpl.cpp \
|
|
HistoryActionEvents.cpp \
|
|
ISupportsPeer.cpp \
|
|
NativeEventThread.cpp \
|
|
NativeEventThreadActionEvents.cpp \
|
|
NavigationImpl.cpp \
|
|
NavigationActionEvents.cpp \
|
|
InputStreamShim.cpp \
|
|
RDFEnumeration.cpp \
|
|
RDFTreeNode.cpp \
|
|
RDFActionEvents.cpp \
|
|
wsRDFObserver.cpp \
|
|
WindowControlImpl.cpp \
|
|
WindowControlActionEvents.cpp \
|
|
PreferencesImpl.cpp \
|
|
PreferencesActionEvents.cpp \
|
|
WrapperFactoryImpl.cpp \
|
|
WindowCreator.cpp \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
CPPSRCS += \
|
|
gtk/GtkBrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
DIRS = gtk
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
CPPSRCS += \
|
|
win32/Win32BrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
else
|
|
CPPSRCS += \
|
|
gtk/GtkBrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
DIRS = gtk
|
|
endif
|
|
endif
|
|
|
|
|
|
EXTRA_LIBS += \
|
|
$(XPCOM_LIBS) \
|
|
$(NSPR_LIBS) \
|
|
$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
EXTRA_LIBS += \
|
|
$(DIST)/lib/wc_share.lib \
|
|
$(MOZ_JDKHOME)/jre/lib/jawt.lib \
|
|
$(NULL)
|
|
endif
|
|
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
ifdef MOZ_ENABLE_GTK
|
|
ifndef MOZ_MONOLITHIC_TOOLKIT
|
|
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
|
CFLAGS += $(MOZ_GTK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
|
|
else
|
|
CXXFLAGS += $(TK_CFLAGS)
|
|
CFLAGS += $(TK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
CXXFLAGS += -DBAL_INTERFACE
|
|
endif
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
EXTRA_DSO_LDOPTS += -lwc_share_bal
|
|
else
|
|
ifneq ($(OS_ARCH),WINNT)
|
|
EXTRA_DSO_LDOPTS += -lwc_share
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES) \
|
|
-I../src_share -I.
|
|
else
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
endif
|
|
endif
|
|
|
|
|
|
clobber_all:: clobber
|
|
|