diff options
| author | Peter Tribble <peter.tribble@gmail.com> | 2020-11-22 12:02:37 +0000 |
|---|---|---|
| committer | Peter Tribble <peter.tribble@gmail.com> | 2020-11-23 19:25:04 +0000 |
| commit | 273d774d1d685415fd99d31224bdae55e7cfb793 (patch) | |
| tree | 7d9d26d32fbdc5d52e3b9676c0d3729ee2c0dab6 /usr/src/lib/libdtrace_jni/java | |
| parent | 560dcad7f6059e242335a94501511eae11b1308a (diff) | |
| download | illumos-gate-273d774d1d685415fd99d31224bdae55e7cfb793.tar.gz | |
13315 jdk11 makes consistent javadoc generation impossible
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/lib/libdtrace_jni/java')
| -rw-r--r-- | usr/src/lib/libdtrace_jni/java/Makefile | 60 |
1 files changed, 4 insertions, 56 deletions
diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile index 77b53e0108..e48b5501a4 100644 --- a/usr/src/lib/libdtrace_jni/java/Makefile +++ b/usr/src/lib/libdtrace_jni/java/Makefile @@ -38,6 +38,9 @@ PKGNAME=org.opensolaris.os.dtrace APIDIR=$(SRC)/lib/libdtrace_jni/java CLASSES=$(APIDIR)/classes JARS=$(APIDIR)/lib +# the files in the docs directory go with the api javadoc +# which can be generated using the doc target +# the documentation is not built or packaged by default DOCS=$(APIDIR)/docs DOCAPI=$(DOCS)/api DOCEXAMPLES=$(DOCS)/examples @@ -50,26 +53,10 @@ APIJAVASRC=$(APIDIR)/src APIJAR=dtrace.jar JARDESTDIR=$(ROOT)/usr/share/lib/java INSJARS=$(JARDESTDIR)/$(APIJAR) -# javadoc -DOCDESTDIR=$(ROOT)/usr/share/lib/java/javadoc/dtrace -DOCAPIDESTDIR=$(DOCDESTDIR)/api -DOCEXAMPLESDESTDIR=$(DOCDESTDIR)/examples -DOCHTMLDESTDIR=$(DOCDESTDIR)/html -DOCIMAGESDESTDIR=$(DOCDESTDIR)/images -XDOCLINT_OPTION=-Xdoclint:none $(JARDESTDIR)/%: $(JARS)/% $(INS.file) -$(DOCEXAMPLESDESTDIR)/%: $(DOCEXAMPLES)/% - $(INS.file) - -$(DOCHTMLDESTDIR)/%: $(DOCHTML)/% - $(INS.file) - -$(DOCIMAGESDESTDIR)/%: $(DOCIMAGES)/% - $(INS.file) - # Manifest files APIMANI= $(MANIFEST)/dtrace.mf MANIFESTS= $(APIMANI) @@ -165,15 +152,6 @@ clobber: clean $(CLASSES): -@mkdir -p $@ -# Rule for installing API javadoc. -$(DOCAPIDESTDIR)/index.html: $(DTRACE_API_CLASSES) - -@mkdir -p $(DOCAPIDESTDIR) - -$(RM) -r $(DOCAPIDESTDIR)/* - cd $(APIJAVASRC); umask 022; \ - $(JAVADOC) -protected -use -notimestamp $(XDOCLINT_OPTION) \ - -classpath $(APICLASSPATH) -d $(DOCAPIDESTDIR) \ - $(PKGNAME) - $(CLASSES)/$(PKGPATH): $(INS.dir) @@ -184,37 +162,7 @@ $(JARS)/$(APIJAR): $(DTRACE_API_CLASSES) $(APIMANI) $(JARDESTDIR): $(INS.dir) -$(DOCDESTDIR): - $(INS.dir) - -$(DOCAPIDESTDIR): - $(INS.dir) - -$(DOCEXAMPLESDESTDIR): - $(INS.dir) - -$(DOCHTMLDESTDIR): - $(INS.dir) - -$(DOCIMAGESDESTDIR): - $(INS.dir) - -install: all $(JARDESTDIR) $(INSJARS) $(DOCDESTDIR) \ - $(DOCAPIDESTDIR) \ - $(DOCAPIDESTDIR)/index.html \ - $(DOCEXAMPLESDESTDIR) \ - $(DOCEXAMPLESDESTDIR)/TestAPI.java \ - $(DOCEXAMPLESDESTDIR)/TestAPI2.java \ - $(DOCEXAMPLESDESTDIR)/TestTarget.java \ - $(DOCEXAMPLESDESTDIR)/hello.d \ - $(DOCEXAMPLESDESTDIR)/intrstat.d \ - $(DOCEXAMPLESDESTDIR)/syscall.d \ - $(DOCEXAMPLESDESTDIR)/target.d \ - $(DOCHTMLDESTDIR) \ - $(DOCHTMLDESTDIR)/JavaDTraceAPI.html \ - $(DOCHTMLDESTDIR)/fast.html \ - $(DOCIMAGESDESTDIR) \ - $(DOCIMAGESDESTDIR)/JavaDTraceAPI.gif +install: all $(JARDESTDIR) $(INSJARS) # empty targets for top-level building compatability install_h: |