Added partial Java support

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5107 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,19 @@
+1999-10-30  Lyndon Tremblay  <ltremblay@mezzanine.xnot.com>
+
+	* brain.make: Added Java support.
+	* common.make: Likewise
+	* config.make.in: Added JAVA_INCLUDE/JAVAC vars.
+	* configure: New build for Java support.
+	* configure.in: Added JAVA_INCLUDE/JAVAC vars.
+	* java-application.make: Added, but not worked on yet.
+	* java-executable.template: Added basics, not complete.
+	* java-wrapper.make: Working as close to Apple's bridget tool as I know.
+	* rules.make: Added Java support.
+
+	NOTE: building a java wrapper right now is basically useless now, until
+	I commit the bridging library and tools, which are in the works.
+
+
 1999-10-23  Adam Fedor  <fedor@gnu.org>
 
 	* debugapp: Allow debugger to be set from environment (patch from 

brain.make

@@ -6,6 +6,7 @@
 #   Copyright (C) 1997 Free Software Foundation, Inc.
 #
 #   Author:  Scott Christley <scottc@net-community.com>
+#   Java support by Lyndon Tremblay <ltremblay@mezzanine.xnot.com>
 #
 #   This file is part of the GNUstep Makefile Package.
 #
@@ -223,7 +224,7 @@ SYSTEM_LIBS =
 # then add X headers and libraries
 #
 ifeq ($(GUI_BACKEND_LIB),xdps)
-SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
+SYSTEM_INCLUDES = $(JAVA_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
 SYSTEM_LDFLAGS =
 SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
 SYSTEM_LIBS = -ltiff $(JPEG) -ldpstk -ldps -lpsres -lXt $(X_PRE_LIBS) -lXext -lX11
@@ -234,14 +235,14 @@ endif
 # then add X headers and libraries
 #
 ifeq ($(GUI_BACKEND_LIB),xraw)
-SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
+SYSTEM_INCLUDES = $(JAVA_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
 SYSTEM_LDFLAGS =
 SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
 SYSTEM_LIBS = -ltiff $(JPEG) -lX11
 endif
 
 ifeq ($(GUI_BACKEND_LIB),xgps)
-SYSTEM_INCLUDES = $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
+SYSTEM_INCLUDES = $(JAVA_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE) $(X_INCLUDE)
 SYSTEM_LDFLAGS =
 SYSTEM_LIB_DIR = $(TIFF_LIB) $(JPEG_LIB) $(X_LIBS)
 SYSTEM_LIBS = -ltiff $(JPEG) -lXext -lX11

common.make

@@ -7,6 +7,7 @@
 #
 #   Author:  Scott Christley <scottc@net-community.com>
 #   Author:  Ovidiu Predescu <ovidiu@net-community.com>
+#   Java support by Lyndon Tremblay <ltremblay@mezzanine.xnot.com>
 #
 #   This file is part of the GNUstep Makefile Package.
 #
@@ -280,6 +281,7 @@ endif
 ifeq ($(debug), yes)
 OPTFLAG := $(filter-out -O%, $(OPTFLAG))
 ADDITIONAL_FLAGS += -g -Wall -DDEBUG
+ADDITIONAL_JAVAFLAGS += -g
 OBJ_DIR_PREFIX += debug_
   LIBRARY_NAME_SUFFIX := d$(LIBRARY_NAME_SUFFIX)
 endif
@@ -331,6 +333,9 @@ GNUSTEP_DVIPS_FLAGS =
 # Common variables for subprojects
 SUBPROJECT_PRODUCT = subproject$(OEXT)
 
+# FIXME: the JAVAC variable is blank otherwise, even though it's defined in config.make
+JAVAC = javac
+
 ## Local variables:
 ## mode: makefile
 ## End:

config.make.in

@@ -8,6 +8,7 @@
 #
 #   Author:  Scott Christley <scottc@net-community.com>
 #   Author:  Ovidiu Predescu <ovidiu@net-community.com>
+#   Java additions by Lyndon Tremblay <ltremblay@mezzanine.xnot.com>
 #
 #   This file is part of the GNUstep Makefile Package.
 #
@@ -116,6 +117,16 @@ DPS_DEFINE=@DPS_DEFINE@
 # Any user specified libs, like thread libraries
 CONFIG_SYSTEM_LIBS = @LIBS@
 
+#
+# Java configuration
+#
+JAVA_INCLUDE := @JAVA_INCLUDE@
+ifeq ($(JAVA_INCLUDE,-INONE)
+	JAVA_INCLUDE=
+endif
+
+JAVAC = @JAVAC@
+
 ## Local variables:
 ## mode: makefile
 ## End: