4719 Common patchset for jdk1.7 support preparation

@@ -74,23 +74,23 @@
 
 # Controlled CLASSPATH for making
 APICLASSPATH=$(CLASSES):$(APIJAVASRC)
 
 # javac flags
-JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH) -deprecation
-JFLAGS += -target 1.5
-JFLAGS += -Xlint
+JFLAGS= -g -d $(CLASSES) -sourcepath $(APICLASSPATH)
+JFLAGS += -source 1.5 -target 1.6
+JFLAGS += -Xlint:all,-rawtypes,-options
 
 # The default make rule for Java files
 COMPILE.java=$(JAVAC) $(JFLAGS)
 
 $(CLASSES)/$(PKGPATH)/%.class:  $(APIJAVASRC)/$(PKGPATH)/%.java
                                 $(COMPILE.java) $<
 
 # javah generated headers
 APIHDR= LocalConsumer.h
-JNIHDRS=$(JNI)/$(APIHDRS)
+JNIHDRS=$(JNI)/$(APIHDR)
 
 # API classes with native methods
 JNI_CLASSNAMES=\
     LocalConsumer