Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6f3edb2ec21649145159dfd533b1bc16cbdda583
Mozilla/mozilla/java/webclient/src_moz/Makefile.in
edburns%acm.org 0e64ca3709 bug 64445 
author edburns
r=ashuk
a=edburns

This checkin corrects an earlier omission of the proper policy of having
all maor actions take place using nsActionEvents.  This is necessary to
avoid thread safety assertions.

The following files are in this fix:

M classes_spec/org/mozilla/webclient/wrapper_native/PreferencesImpl.java
M src_moz/Makefile.in
M src_moz/Makefile.win
A src_moz/PreferencesActionEvents.cpp
A src_moz/PreferencesActionEvents.h
M src_moz/PreferencesImpl.cpp
M src_moz/motif/NativeLoaderStub.cpp


git-svn-id: svn://10.0.0.236/branches/JAVADEV_RTM_20001102@84623 18797224-902f-48f8-a5cc-f745e15eee43
2001-01-09 00:59:58 +00:00

195 lines
8.5 KiB
Makefile
Raw Blame History

# 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 = $(DEPTH)
srcdir = $(topsrcdir)/java/webclient/src_moz
VPATH = $(topsrcdir)/java/webclient/src_moz
# We don't need to build the stubs in the BAL case.
ifeq ($(BAL_INTERFACE),)
DIRS = motif
endif
JAVAHOME = $(JDKHOME)
include $(DEPTH)/config/autoconf.mk
ifneq ($(BAL_INTERFACE),)
LIBRARY_NAME = webclient_bal
else
LIBRARY_NAME = webclient
endif
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 \
NavigationImpl.cpp \
NavigationActionEvents.cpp \
InputStreamShim.cpp \
RDFEnumeration.cpp \
RDFTreeNode.cpp \
RDFActionEvents.cpp \
wsRDFObserver.cpp \
WindowControlImpl.cpp \
WindowControlActionEvents.cpp \
PreferencesImpl.cpp \
PreferencesActionEvents.cpp \
WrapperFactoryImpl.cpp \
motif/MotifBrowserControlCanvas.cpp \
motif/gtkmozilla.cpp \
$(NULL)
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 -lxpfelocation_s -L/usr/X11R6/lib -lXt
else
CXXFLAGS += $(TK_CFLAGS)
CFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -lxpfelocation_s -L/usr/X11R6/lib -lXt
endif
endif
ifneq ($(BAL_INTERFACE),)
CXXFLAGS += -DBAL_INTERFACE
endif
EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -L$(DEPTH)/dist/bin/components -lwidget_gtk
ifneq ($(BAL_INTERFACE),)
EXTRA_DSO_LDOPTS += -lwc_share_bal
else
EXTRA_DSO_LDOPTS += -lwc_share
endif
ifeq ($(OS_ARCH),Linux)
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
else
INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
-I$(DEPTH)/widget/src/gtk -I../src_share
endif
ifneq ($(PACKAGE_BUILD),)
ifneq ($(VERSION_NUMBER),)
VERSION_NUMBER=0.9
endif # VERSION_NUMBER
PACKAGE_DIR=$(topsrcdir)/dist/javadev
PACKAGE_LIB=$(PACKAGE_DIR)/lib
PACKAGE_EXAMPLE=$(PACKAGE_DIR)/example
endif # PACKAGE_BUILD
buildRunems:
ifeq ($(BAL_INTERFACE),)
ifeq ($(PACKAGE_BUILD),)
@echo +++ Creating runem. Use this to run the test browser.
rm -f runem
@echo #!/bin/sh > runem
@echo $(PERL) ../src_share/runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
chmod 755 runem
else
@echo +++ Commercial Packaging - Copying runem_solaris. Used to run test
if test ! -d $(PACKAGE_EXAMPLE) ; then mkdir $(PACKAGE_EXAMPLE) ; else true ; fi ;
cp $(topsrcdir)/dist/bin/libwebclientstub.so $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libwebclient.so $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/lib/libwc_share.a $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libjavadomjni.so $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/libplugletjni.so $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libpluglet.so $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavadom.so $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libbcorb.so $(PACKAGE_LIB)/libbcorb.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libbcjavastubs.so $(PACKAGE_LIB)/libbcjavastubs.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavaloader.so $(PACKAGE_LIB)/libjavaloader.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libjavaSample.so $(PACKAGE_LIB)/libjavaSample.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libbcTest.so $(PACKAGE_LIB)/libbcTest.so.$(VERSION_NUMBER)
cp $(topsrcdir)/dist/bin/components/libbcxpcomstubs.so $(PACKAGE_LIB)/libbcxpcomstubs.so.$(VERSION_NUMBER)
rm -f $(topsrcdir)/dist/bin/libwebclientstub.so
rm -f $(topsrcdir)/dist/lib/libwebclientstub.so
rm -f $(topsrcdir)/dist/bin/libwebclient.so
rm -f $(topsrcdir)/dist/lib/libwebclient.so
rm -f $(topsrcdir)/dist/lib/libwc_share.a
rm -f $(topsrcdir)/dist/bin/libjavadomjni.so
rm -f $(topsrcdir)/dist/lib/libjavadomjni.so
rm -f $(topsrcdir)/dist/bin/libplugletjni.so
rm -f $(topsrcdir)/dist/lib/libplugletjni.so
rm -f $(topsrcdir)/dist/bin/components/libpluglet.so
rm -f $(topsrcdir)/dist/lib/components/libpluglet.so
rm -f $(topsrcdir)/dist/bin/components/libjavadom.so
rm -f $(topsrcdir)/dist/lib/components/libjavadom.so
rm -f $(topsrcdir)/dist/bin/components/libbcorb.so
rm -f $(topsrcdir)/dist/bin/components/libbcjavastubs.so
rm -f $(topsrcdir)/dist/bin/components/libjavaloader.so
rm -f $(topsrcdir)/dist/bin/components/libjavaSample.so
rm -f $(topsrcdir)/dist/bin/components/libbcTest.so
rm -f $(topsrcdir)/dist/bin/components/libbcxpcomstubs.so
chmod 555 $(PACKAGE_LIB)/libwebclientstub.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwebclient.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libwc_share.a.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadomjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libplugletjni.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libpluglet.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavadom.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libbcorb.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libbcjavastubs.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavaloader.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libjavaSample.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libbcTest.so.$(VERSION_NUMBER)
chmod 555 $(PACKAGE_LIB)/libbcxpcomstubs.so.$(VERSION_NUMBER)
if test ! -d $(PACKAGE_LIB)/libbcorb.so ; then ln -s libbcorb.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libbcorb.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libbcjavastubs.so ; then ln -s libbcjavastubs.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libbcjavastubs.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavaloader.so ; then ln -s libjavaloader.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavaloader.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavaSample.so ; then ln -s libjavaSample.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavaSample.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libbcTest.so ; then ln -s libbcTest.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libbcTest.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libbcxpcomstubs.so ; then ln -s libbcxpcomstubs.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libbcxpcomstubs.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwc_share.a ; then ln -s libwc_share.a.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwc_share.a ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclientstub.so ; then ln -s libwebclientstub.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclientstub.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libwebclient.so ; then ln -s libwebclient.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libwebclient.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadomjni.so ; then ln -s libjavadomjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadomjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libplugletjni.so ; then ln -s libplugletjni.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libplugletjni.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libpluglet.so ; then ln -s libpluglet.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libpluglet.so ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/libjavadom.so ; then ln -s libjavadom.so.$(VERSION_NUMBER) $(PACKAGE_LIB)/libjavadom.so ; else true ; fi ;
if test ! -d $(PACKAGE_EXAMPLE)/runem ; then cp $(topsrcdir)/java/webclient/src_share/runem_solaris $(PACKAGE_EXAMPLE)/runem ; else true ; fi ;
chmod 755 $(PACKAGE_EXAMPLE)/runem
cp $(topsrcdir)/java/README.commercial $(PACKAGE_DIR)/README
endif # PACKAGE_BUILD
endif # BAL_INTERFACE
install:: buildRunems
Reference in New Issue View Git Blame Copy Permalink