diff options
Diffstat (limited to 'usr/src/cmd/pools/poold/Makefile')
| -rw-r--r-- | usr/src/cmd/pools/poold/Makefile | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile index 757f882219..9dfb547196 100644 --- a/usr/src/cmd/pools/poold/Makefile +++ b/usr/src/cmd/pools/poold/Makefile @@ -23,6 +23,8 @@ # Use is subject to license terms. # # Copyright (c) 2018, Joyent, Inc. +# Copyright 2020 Peter Tribble +# PROG = poold OBJS = poold.o @@ -32,7 +34,7 @@ MANIFEST= poold.xml SVCMETHOD= svc-poold include $(SRC)/cmd/Makefile.cmd -$(BLD_JAVA_8)include $(SRC)/cmd/Makefile.cmd.64 +include $(SRC)/cmd/Makefile.cmd.64 JAVA_SUBDIRS = com/sun/solaris/service/exception \ com/sun/solaris/service/kstat \ @@ -53,18 +55,16 @@ all := TARGET = all install := TARGET = install clean := TARGET = clean clobber := TARGET = clobber -lint := TARGET = lint msg := TARGET = msg $(ROOTMANIFEST):= FILEMODE= 444 JARFILE = JPool.jar -JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH)/client -LIBPOOL_PATH = $(ROOTLIB) -$(BLD_JAVA_8)JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH64)/server -$(BLD_JAVA_8)LIBPOOL_PATH = $(ROOTLIB64) +JAVA_LIB_PATH = $(JAVA_ROOT)/jre/lib/$(MACH64)/server +$(BLD_JAVA_11)JAVA_LIB_PATH = $(JAVA_ROOT)/lib/server +LIBPOOL_PATH = $(ROOTLIB64) -# JAVA_SUBDIRS and PACKAGEDOCS must be synchronized to ensure +# JAVA_SUBDIRS and PACKAGEDOCS must be synchronized to ensure # javadoc documentation is generated for all packages. PACKAGEDOCS = com.sun.solaris.service.exception \ @@ -83,10 +83,6 @@ LDLIBS += -lpool -L$(JAVA_LIB_PATH) -ljvm # runpath should point to runtime JAVA_HOME LDFLAGS += -R$(JAVA_LIB_PATH) -LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2 -$(BLD_JAVA_8)LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2 -LINTLIBS += -L$(LIBPOOL_PATH) -lpool - # not linted SMATCH=off @@ -120,8 +116,6 @@ clobber : $(JAVA_SUBDIRS) $(SUBDIRS) clobber_local clobber_local: clean_local $(RM) $(CLOBBERFILES) -lint: $(SUBDIRS) - msg: $(POFILES) install: $(ROOTCMD) $(JAVA_SUBDIRS) $(JARFILE) \ @@ -147,7 +141,7 @@ $(SUBDIRS): FRC doc: all $(JAVADOC) -private -classpath $(JARFILE): -sourcepath . \ - -source 1.4 -d $(DOCDIR) $(PACKAGEDOCS) + -source 7 -d $(DOCDIR) $(PACKAGEDOCS) $(PROG): $(OBJS) $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS) @@ -158,7 +152,4 @@ $(ROOTUSRLIBDRP)/%: % FRC: -lint: - $(LINT.c) $(PROG).c $(LINTLIBS) - include $(SRC)/cmd/Makefile.targ |