From 8c4107130e9c4dc4b67f05f70863cc932c2e5970 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Fri, 30 Jun 2000 18:50:02 +0000 Subject: [PATCH] Finally_make_use_of_Sherry_Shen_changes git-svn-id: svn://10.0.0.236/trunk@73597 18797224-902f-48f8-a5cc-f745e15eee43 --- .../java/webclient/classes_spec/Makefile.in | 75 +++++++++++++++++++ .../java/webclient/classes_spec/Makefile.unix | 41 ---------- 2 files changed, 75 insertions(+), 41 deletions(-) create mode 100644 mozilla/java/webclient/classes_spec/Makefile.in delete mode 100644 mozilla/java/webclient/classes_spec/Makefile.unix diff --git a/mozilla/java/webclient/classes_spec/Makefile.in b/mozilla/java/webclient/classes_spec/Makefile.in new file mode 100644 index 00000000000..4d8938cf8a1 --- /dev/null +++ b/mozilla/java/webclient/classes_spec/Makefile.in @@ -0,0 +1,75 @@ +#!gmake +# +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Reserved. +#//------------------------------------------------------------------------ +#// +#// Makefile to build the java portion of the java wrapper to mozilla +#// +#//------------------------------------------------------------------------ + + + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = webclient + +JMODS = org/mozilla/webclient \ + org/mozilla/webclient/wrapper_native \ + org/mozilla/webclient/wrapper_native/motif \ + org/mozilla/webclient/test + +# +# JDIRS is dependant on JAVA_DESTPATH in config/rules.m[a]k. +# Be sure to touch that directory if you add a new directory to +# JDIRS, or else it will not build. FIXME +# +JDIRS = $(JMODS) + +JAR_JSJ = jsj10.jar +JAR_JSJ_CLASSES = $(JMODS) + +# +# jars to build at install time +# +JARS = $(JAR_JSJ) + +JAVA_OR_NSJVM = 1 + +include $(topsrcdir)/config/rules.mk + +JAVA_SOURCEPATH = $(topsrcdir)/java/webclient/classes_spec +JAVAC_FLAGS = -classpath $(CLASSPATH):$(JAVA_DESTPATH) -d $(JAVA_DESTPATH) + +doc:: + $(JAVADOC) -d $(DIST)/doc org.mozilla.util + +natives_list:: FORCE + rm -rf $@ + find . -name "*.class" -print | sed 's@\./\(.*\)\.class$$@\1@' | \ + sed 's@/@.@g' | xargs $(JVH) -natives | sort > $@ + +check_natives:: natives_list + rm -f found_natives + nm -B ../$(OBJDIR)/*.o \ + | egrep "Java.*_stub" | awk '{ print $$3; }' | sort > found_natives + diff found_natives natives_list + +FORCE: diff --git a/mozilla/java/webclient/classes_spec/Makefile.unix b/mozilla/java/webclient/classes_spec/Makefile.unix deleted file mode 100644 index 817a0287594..00000000000 --- a/mozilla/java/webclient/classes_spec/Makefile.unix +++ /dev/null @@ -1,41 +0,0 @@ -# PENDING(mark): I need to make this makefile a little smarter. Right now -# it javac's all the java files each time you do a 'make' -# -# If you're using JDK 1.2 -JDK_LOCATION = ${JDKHOME} -JAVAC = ${JDK_LOCATION}/bin/javac -JAVAH = ${JDK_LOCATION}/bin/javah -OUTPUT_DIR = ../../../dist/classes -# If you're using JDK 1.2 -CLASSES = ${OUTPUT_DIR}:${JDK_LOCATION}/lib/tools.jar:${JDK_LOCATION}/lib/rt.jar:${CLASSPATH} -JAVA_FILES = ./org/mozilla/webclient/*.java ./org/mozilla/webclient/wrapper_native/*.java ./org/mozilla/webclient/wrapper_native/motif/*.java ./org/mozilla/webclient/test/*.java -JAVAH_OUTPUT_DIR = ../src_moz -CP = cp -MKDIR = mkdir -p - -all: - ${MKDIR} ${OUTPUT_DIR} - ${JAVAC} -g -classpath ${CLASSES} -d ${OUTPUT_DIR} ${JAVA_FILES} - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/motif/MotifBrowserControlCanvas.h org.mozilla.webclient.wrapper_native.motif.MotifBrowserControlCanvas - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl - ${JAVAH} -jni -classpath ${CLASSES} \ - -o ${JAVAH_OUTPUT_DIR}/WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl -