Print this page
4719 Common patchset for jdk1.7 support preparation

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libslp/javalib/Makefile.conf
          +++ new/usr/src/lib/libslp/javalib/Makefile.conf
↓ open down ↓ 47 lines elided ↑ open up ↑
  48   48  # Manifest files
  49   49  SLPMANI= $(CLASSES)/manifest.slp
  50   50  SLPDMANI= $(CLASSES)/manifest.slpd
  51   51  
  52   52  MANIFESTS= $(SLPMANI) $(SLPDMANI)
  53   53  
  54   54  # Controlled CLASSPATH for making
  55   55  SLPCLASSPATH=$(CLASSES):$(SLPJAVASRC)
  56   56  
  57   57  # javac flags
  58      -JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH) -deprecation
       58 +JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH)
       59 +JFLAGS += -source 1.6 -target 1.6 -Xlint:deprecation,-options
  59   60  
  60   61  # The default make rule for Java files
  61   62  COMPILE.java=$(JAVAC) $(JFLAGS)
  62   63  
  63   64  $(CLASSES)/$(PKGPATH)/%.class:  $(SLPJAVASRC)/$(PKGPATH)/%.java
  64   65                                  $(COMPILE.java) $<
  65   66  
  66   67  # Where to put the message files
  67   68  MSGDIR =        $(ROOT)/usr/share/lib/locale/$(PKGPATH)
  68   69  MSGDIRS =       $(ROOT)/usr/share/lib/locale \
↓ open down ↓ 84 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX