From 5bed7a35a6f3a842182ab9a2fdfa5400d2220466 Mon Sep 17 00:00:00 2001
From: jestin
Date: Wed, 8 Jan 2003 10:19:20 +0000
Subject: get rid of ugly symlinks

---
 examples/Makefile | 17 ++++++++++-------
 src/Makefile      | 24 +++++++++++++-----------
 tests/Makefile    | 12 ++++++++----
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/examples/Makefile b/examples/Makefile
index d4326ad..2d12e02 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,8 +1,11 @@
 .SUFFIXES: .java .class
      SRCS = TestIvy.java TestIvySwing.java Counter.java ivyTranslater.java Translate.java TranslateXML.java
      OBJS = $(SRCS:.java=.class)
-#
-# Be sure to choose on of them before compiling ...
+
+NANOXMLPATH=/export/home/jestin/java/Jars/nanoxml-2.2.1.jar
+GNUPATH=/usr/share/java/repository:/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.jar
+BUILDPATH=../lib/ivy-java.jar
+ADD=$(GNUPATH):$(BUILDPATH):$(NANOXMLPATH)
 
 #######################################
 # jikes setup on my box
@@ -11,33 +14,33 @@
 #   RTPATH = /usr/local/j2sdk1.4.1/jre/lib/rt.jar
 #JIKESPATH = ${RTPATH}:/usr/share/java/gnu.getopt.jar:/usr/share/java/repository
 #JAVACOPTS = -d . -deprecation
-#    JAVAC = jikes -classpath $(JIKESPATH)
+#    JAVAC = jikes -classpath $(JIKESPATH):$(ADD)
 
 #######################################
 # generic setup
 #######################################
 #    JAVAC = javac
 #JAVACOPTS = -d . -deprecation
-#CLASSPATH = 
+#CLASSPATH = -classpath .:$(ADD)
 
 #######################################
 # blackdown jdk118 setup
 #######################################
 #    JAVAC = /usr/local/jdk118_v3/bin/javac
-#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar
+#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar:$(ADD)
 #JAVACOPTS = -d .
 
 ######################################
 # local Blackdown linux 1.2.2
 ######################################
-#CLASSPATH = -classpath .
+#CLASSPATH = -classpath .:$(ADD)
 #JAVACOPTS = -deprecation -d .
 #    JAVAC = /usr/local/jdk1.2.2/bin/javac
 
 ######################################
 # local Blackdown linux 1.3.1
 ######################################
-CLASSPATH = -classpath .
+CLASSPATH = -classpath .:$(ADD)
 JAVACOPTS = -deprecation
 JAVAOPTS =
 JAVA = /usr/local/j2sdk1.3.1/bin/java 
diff --git a/src/Makefile b/src/Makefile
index b53ba51..58a73cd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,12 @@
+GNUPATH=/usr/share/java/repository:/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.jar
+
+#######################################
+# generic setup
+#######################################
+    JAVAC = javac
+JAVACOPTS = -d . -deprecation
+CLASSPATH = -classpath .:$(GNUPATH)
+
 #######################################
 # jikes setup on my box
 #######################################
@@ -7,30 +16,23 @@
 #CLASSPATH = -classpath .:$(RTPATH)
 
 #######################################
-# generic setup
-#######################################
-    JAVAC = javac
-JAVACOPTS = -d . -deprecation
-CLASSPATH = -classpath .
-
-#######################################
 # blackdown jdk118 setup
 #######################################
 #    JAVAC = /usr/local/jdk118_v3/bin/javac
-#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar
+#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar:$(GNUPATH)
 #JAVACOPTS = -d .
 
 ######################################
 # local Blackdown linux 1.2.2
 ######################################
-#CLASSPATH = -classpath .
+#CLASSPATH = -classpath .:$(GNUPATH)
 #JAVACOPTS = -deprecation -d .
 #    JAVAC = /usr/local/jdk1.2.2/bin/javac
 
 ######################################
 # local Blackdown linux 1.3.1
 ######################################
-#CLASSPATH = -classpath .
+#CLASSPATH = -classpath .:$(GNUPATH)
 #JAVACOPTS = -deprecation -d .
 #    JAVAC = /usr/local/j2sdk1.3.1/bin/javac
 
@@ -54,5 +56,5 @@ docs:
 	rm -fR $(DOCS)/*html
 	rm -fR $(DOCS)/*css
 	rm -fR $(DOCS)/fr
-	javadoc -d $(DOCS) $(SRCS)
+	javadoc $(CLASSPATH) -d $(DOCS) $(SRCS)
 	rm $(DOCS)/package-list
diff --git a/tests/Makefile b/tests/Makefile
index bb2a8db..c4253f4 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,13 +2,17 @@
 SRC = TestNet.java Bug.java BugTok.java BenchLocal.java ProbeBench.java DieSender.java TestApi.java
 OBJ = $(SRC:.java=.class)
 
+GNUPATH=/usr/share/java/repository:/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.jar
+BUILDPATH=../lib/ivy-java.jar
+ADD=$(GNUPATH):$(BUILDPATH)
+
 #JAVAOPTS = -DIVY_PING
 # DONOTBUILD = TestNetSwing.java  # Color(r,g,b,a) doesn't exist in jdk1.1
 
 ######################################
 # Local installation
 ######################################
-CLASSPATH=-classpath .
+CLASSPATH=-classpath .:$(ADD)
 JAVACOPTS= -deprecation
 JAVAOPTS =
 JAVAC= javac
@@ -17,7 +21,7 @@ JAVA = java
 ######################################
 # local Blackdown linux 118_v3 system
 ######################################
-#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar
+#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar:$(ADD)
 #JAVACOPTS =
 #JAVAOPTS =
 #JAVA = /usr/local/jdk118_v3/bin/java 
@@ -26,7 +30,7 @@ JAVA = java
 ######################################
 # local Blackdown linux 1.2.2
 ######################################
-#CLASSPATH = -classpath .
+#CLASSPATH = -classpath .:$(ADD)
 #JAVACOPTS = -deprecation
 #JAVAOPTS =
 #JAVA = /usr/local/jdk1.2.2/bin/java 
@@ -35,7 +39,7 @@ JAVA = java
 ######################################
 # local Blackdown linux 1.3.1
 ######################################
-#CLASSPATH = -classpath .
+#CLASSPATH = -classpath .:$(ADD)
 #JAVACOPTS = -deprecation
 #JAVAOPTS =
 #JAVA = /usr/local/j2sdk1.3.1/bin/java 
-- 
cgit v1.1