Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split GeckoEmbed.java into two files, so GeckoEmbed just contains embedding functions. Better name for library. Use JAVA_HOME for location of Java includes. Not part of default build.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@163084 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2004-10-01 16:19:03 +00:00
parent 2391b0b289
commit 0824d4c802
4 changed files with 149 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/extensions/java/xpcom/Makefile.in
View File

@@ -43,8 +43,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
MODULE = javaembed
LIBRARY_NAME = javaembed
MODULE = javaxpcom
LIBRARY_NAME = javaxpcom
EMBED_JAR = mozembed.jar
EMBED_JAR_SRC = $(patsubst %.jar,%-src.jar,$(EMBED_JAR))
@@ -62,12 +62,18 @@ CPPSRCS = \
nsJavaXPCOMBindingUtils.cpp \
$(NULL)
JAVA_LOC = /opt/IBMJava2-141
# Can't use JAVA_SRCS for now, since that one is referenced in config.mk
JAVA_SRCS_ = \
XPCOM.java \
GeckoEmbed.java \
$(NULL)
LOCAL_INCLUDES = \
-I$(JAVA_LOC)/include \
-I$(JAVA_HOME)/include \
$(NULL)
LOCAL_INCLUDES += -I$(JAVA_HOME)/include/linux
EXTRA_DSO_LIBS = \
embed_base_s \
$(NULL)
@@ -130,12 +136,12 @@ $(XPIDL_GEN_DIR)/org/mozilla/xpcom/stubs/.java_done: $(XPIDL_COMPILE) $(XPIDL_GE
#$(XPIDL_GEN_DIR)/org/mozilla/xpcom/%.java: $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
# $(ELOG) $(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/org/mozilla/xpcom/$* $(_VPATH_SRCS)
$(XPIDL_GEN_DIR)/org/mozilla/xpcom/.java_done: $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/org/mozilla/xpcom/.done GeckoEmbed.java
$(XPIDL_GEN_DIR)/org/mozilla/xpcom/.java_done: $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/org/mozilla/xpcom/.done $(JAVA_SRCS_)
@echo Making Java interface files
@for idl in $(IDL_FILES); do \
$(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/org/mozilla/xpcom/`basename $$idl` $$idl; \
done
@$(INSTALL) -m 644 $(srcdir)/GeckoEmbed.java $(XPIDL_GEN_DIR)/org/mozilla/xpcom
@$(INSTALL) -m 644 $(addprefix $(srcdir)/,$(JAVA_SRCS_)) $(XPIDL_GEN_DIR)/org/mozilla/xpcom
@touch $@
#org/mozilla/xpcom/stubs/%.class: $(XPIDL_GEN_DIR)/org/mozilla/xpcom/stubs/.java_done org/mozilla/xpcom/stubs/.done