* lib/Makefile.am (compile_classpath): Added jsr166.

	* configure.ac: Added external/jsr166/Makefile.
	* external/Makefile.am (SUBDIRS): Added jsr166.
	* external/jsr166/Makefile.am: New file.
	* lib/gen-classlist.sh.in: Look in external/jsr166.

6 files changed, 91 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a45cc1174..39a09fff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-06-16  Tom Tromey  <tromey@redhat.com>
 
+	* lib/Makefile.am (compile_classpath): Added jsr166.
+	* configure.ac: Added external/jsr166/Makefile.
+	* external/Makefile.am (SUBDIRS): Added jsr166.
+	* external/jsr166/Makefile.am: New file.
+	* lib/gen-classlist.sh.in: Look in external/jsr166.
+
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
 	Imported JSR 166 reference implementation:
 	* .classpath: Added external/jsr166.
 	* java/util/concurrent/CopyOnWriteArrayList.java: New file.
diff --git a/configure.ac b/configure.ac
index c9b9d6585..1939dc538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,6 +706,7 @@ external/Makefile
 external/sax/Makefile
 external/w3c_dom/Makefile
 external/relaxngDatatype/Makefile
+external/jsr166/Makefile
 gnu/classpath/Configuration.java
 include/Makefile
 native/Makefile
diff --git a/external/Makefile.am b/external/Makefile.am
index 7f6273373..2eeef805a 100644
--- a/external/Makefile.am
+++ b/external/Makefile.am
@@ -1,5 +1,5 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = sax w3c_dom relaxngDatatype
+SUBDIRS = sax w3c_dom relaxngDatatype jsr166
 
 EXTRA_DIST = README
diff --git a/external/jsr166/Makefile.am b/external/jsr166/Makefile.am
new file mode 100644
index 000000000..fa2db2ebf
--- /dev/null
+++ b/external/jsr166/Makefile.am
@@ -0,0 +1,74 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = IMPORTING \
+readme \
+java/util/AbstractQueue.java \
+java/util/concurrent/ScheduledThreadPoolExecutor.java \
+java/util/concurrent/ExecutorCompletionService.java \
+java/util/concurrent/LinkedBlockingQueue.java \
+java/util/concurrent/BlockingDeque.java	\
+java/util/concurrent/Delayed.java \
+java/util/concurrent/ThreadFactory.java	\
+java/util/concurrent/ArrayBlockingQueue.java \
+java/util/concurrent/RunnableFuture.java \
+java/util/concurrent/LinkedBlockingDeque.java \
+java/util/concurrent/CopyOnWriteArraySet.java \
+java/util/concurrent/DelayQueue.java \
+java/util/concurrent/SynchronousQueue.java \
+java/util/concurrent/Executor.java \
+java/util/concurrent/ExecutionException.java \
+java/util/concurrent/Semaphore.java \
+java/util/concurrent/BrokenBarrierException.java \
+java/util/concurrent/CompletionService.java \
+java/util/concurrent/CyclicBarrier.java	\
+java/util/concurrent/AbstractExecutorService.java \
+java/util/concurrent/TimeoutException.java \
+java/util/concurrent/ConcurrentMap.java	\
+java/util/concurrent/PriorityBlockingQueue.java	\
+java/util/concurrent/CancellationException.java	\
+java/util/concurrent/ConcurrentSkipListSet.java	\
+java/util/concurrent/ConcurrentLinkedQueue.java	\
+java/util/concurrent/RejectedExecutionHandler.java \
+java/util/concurrent/TimeUnit.java \
+java/util/concurrent/RejectedExecutionException.java \
+java/util/concurrent/ExecutorService.java \
+java/util/concurrent/ConcurrentHashMap.java \
+java/util/concurrent/ScheduledExecutorService.java \
+java/util/concurrent/ThreadPoolExecutor.java \
+java/util/concurrent/BlockingQueue.java	\
+java/util/concurrent/ConcurrentSkipListMap.java	\
+java/util/concurrent/ConcurrentNavigableMap.java \
+java/util/concurrent/Future.java \
+java/util/concurrent/FutureTask.java \
+java/util/concurrent/CountDownLatch.java \
+java/util/concurrent/RunnableScheduledFuture.java \
+java/util/concurrent/Callable.java \
+java/util/concurrent/locks/ReentrantLock.java \
+java/util/concurrent/locks/Lock.java \
+java/util/concurrent/locks/Condition.java \
+java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+java/util/concurrent/locks/LockSupport.java \
+java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+java/util/concurrent/locks/ReadWriteLock.java \
+java/util/concurrent/locks/ReentrantReadWriteLock.java \
+java/util/concurrent/Executors.java \
+java/util/concurrent/atomic/AtomicLongFieldUpdater.java	\
+java/util/concurrent/atomic/AtomicLongArray.java \
+java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+java/util/concurrent/atomic/AtomicBoolean.java \
+java/util/concurrent/atomic/AtomicReferenceArray.java \
+java/util/concurrent/atomic/AtomicStampedReference.java	\
+java/util/concurrent/atomic/AtomicIntegerArray.java \
+java/util/concurrent/atomic/AtomicMarkableReference.java \
+java/util/concurrent/atomic/AtomicReference.java \
+java/util/concurrent/atomic/AtomicInteger.java \
+java/util/concurrent/atomic/AtomicLong.java \
+java/util/concurrent/ScheduledFuture.java \
+java/util/concurrent/Exchanger.java \
+java/util/Deque.java \
+java/util/NavigableMap.java \
+java/util/Queue.java \
+java/util/NavigableSet.java \
+java/util/ArrayDeque.java
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 20116bb4c..c1d36788d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,7 @@ propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax or
 metafiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
 iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
 
-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB)
+compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_ECJ
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in
index ff76a22ea..d383646ef 100755
--- a/lib/gen-classlist.sh.in
+++ b/lib/gen-classlist.sh.in
@@ -26,8 +26,12 @@ echo "Adding java source files from srcdir '@top_srcdir@'."
 
 # The same, but for the external code.
 # Right now all external code is in org/.
-for dir in @top_srcdir@/external/w3c_dom \
-   @top_srcdir@/external/sax @top_srcdir@/external/relaxngDatatype; do
+for dir in \
+   @top_srcdir@/external/w3c_dom \
+   @top_srcdir@/external/sax \
+   @top_srcdir@/external/relaxngDatatype \
+   @top_srcdir@/external/jsr166 \
+   ; do
   (cd $dir
   @FIND@ org -follow -name '*.java' -print |
   sort -r | sed -e 's,/\([^/]*\)$, \1,' |