summaryrefslogtreecommitdiff
path: root/resource
diff options
context:
space:
mode:
authorBrian Jones <cbj@gnu.org>2002-02-08 04:42:28 +0000
committerBrian Jones <cbj@gnu.org>2002-02-08 04:42:28 +0000
commit3b70d2c0150b6490f883df6c02ecb54b723c1546 (patch)
treedcb726af1a52c99e4ad24d0e8e5e9baba630ecd6 /resource
parent114f79e48b0044fd4123a8a010e4197e5ee5f16f (diff)
downloadclasspath-3b70d2c0150b6490f883df6c02ecb54b723c1546.tar.gz
* configure.in: fixed broken make dist by moving some of the checks
out of an if statement wrapping functionality needed only for compiling JNI libraries, so unfortunately yes you probably must have a C compiler even if just compiling the Java source * Makefile.am: dist-hook to use $(distdir) instead of $(top_distdir) * native/gnu.java.awt.image: removed directory, needed file was already part of native/jni/gtk-peer/ directory and library. * resource/java/util/Makefile.am: updated properties files to include in distribution * resource/Makefile.am: include gnu in SUBDIRS * resource/gnu/Makefile.am: new file * resource/gnu/.cvsignore: ditto * resource/gnu/java/Makefile.am: ditto * resource/gnu/java/.cvsignore: ditto * resource/gnu/java/awt/Makefile.am: ditto * resource/gnu/java/awt/.cvsignore: ditto * resource/gnu/java/awt/peer/Makefile.am: ditto * resource/gnu/java/awt/peer/.cvsignore: ditto * resource/gnu/java/awt/peer/gtk/Makefile.am: ditto * resource/gnu/java/awt/peer/gtk/.cvsignore: ditto * configure.in: added above Makefiles to output
Diffstat (limited to 'resource')
-rw-r--r--resource/Makefile.am6
-rw-r--r--resource/gnu/.cvsignore2
-rw-r--r--resource/gnu/Makefile.am4
-rw-r--r--resource/gnu/java/.cvsignore2
-rw-r--r--resource/gnu/java/Makefile.am4
-rw-r--r--resource/gnu/java/awt/.cvsignore2
-rw-r--r--resource/gnu/java/awt/Makefile.am4
-rw-r--r--resource/gnu/java/awt/peer/.cvsignore2
-rw-r--r--resource/gnu/java/awt/peer/Makefile.am4
-rw-r--r--resource/gnu/java/awt/peer/gtk/.cvsignore2
-rw-r--r--resource/gnu/java/awt/peer/gtk/Makefile.am8
-rw-r--r--resource/java/util/Makefile.am2
12 files changed, 40 insertions, 2 deletions
diff --git a/resource/Makefile.am b/resource/Makefile.am
index 13cccf6f0..446718878 100644
--- a/resource/Makefile.am
+++ b/resource/Makefile.am
@@ -1,5 +1,7 @@
## used by automake to generate Makefile.in
-SUBDIRS = java
+SUBDIRS = gnu java
-EXTRA_DIST=japhar-0.09.patch.1
+EXTRA_DIST = \
+ orp-1.0.8.patch \
+ orp-1.0.9.patch
diff --git a/resource/gnu/.cvsignore b/resource/gnu/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/resource/gnu/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/resource/gnu/Makefile.am b/resource/gnu/Makefile.am
new file mode 100644
index 000000000..8b1b73918
--- /dev/null
+++ b/resource/gnu/Makefile.am
@@ -0,0 +1,4 @@
+## used by automake to generate Makefile.in
+
+SUBDIRS = java
+
diff --git a/resource/gnu/java/.cvsignore b/resource/gnu/java/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/resource/gnu/java/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/resource/gnu/java/Makefile.am b/resource/gnu/java/Makefile.am
new file mode 100644
index 000000000..1b2f4fba3
--- /dev/null
+++ b/resource/gnu/java/Makefile.am
@@ -0,0 +1,4 @@
+## used by automake to generate Makefile.in
+
+SUBDIRS = awt
+
diff --git a/resource/gnu/java/awt/.cvsignore b/resource/gnu/java/awt/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/resource/gnu/java/awt/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/resource/gnu/java/awt/Makefile.am b/resource/gnu/java/awt/Makefile.am
new file mode 100644
index 000000000..1f7e25964
--- /dev/null
+++ b/resource/gnu/java/awt/Makefile.am
@@ -0,0 +1,4 @@
+## used by automake to generate Makefile.in
+
+SUBDIRS = peer
+
diff --git a/resource/gnu/java/awt/peer/.cvsignore b/resource/gnu/java/awt/peer/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/resource/gnu/java/awt/peer/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/resource/gnu/java/awt/peer/Makefile.am b/resource/gnu/java/awt/peer/Makefile.am
new file mode 100644
index 000000000..5ce6bc44c
--- /dev/null
+++ b/resource/gnu/java/awt/peer/Makefile.am
@@ -0,0 +1,4 @@
+## used by automake to generate Makefile.in
+
+SUBDIRS = gtk
+
diff --git a/resource/gnu/java/awt/peer/gtk/.cvsignore b/resource/gnu/java/awt/peer/gtk/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/resource/gnu/java/awt/peer/gtk/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/resource/gnu/java/awt/peer/gtk/Makefile.am b/resource/gnu/java/awt/peer/gtk/Makefile.am
new file mode 100644
index 000000000..0f749e85e
--- /dev/null
+++ b/resource/gnu/java/awt/peer/gtk/Makefile.am
@@ -0,0 +1,8 @@
+## used by automake to generate Makefile.in
+
+EXTRA_DIST = \
+ font.properties
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(libdir)/awt
+ $(INSTALL_DATA) $(srcdir)/font.properties $(DESTDIR)$(libdir)/awt/font.properties
diff --git a/resource/java/util/Makefile.am b/resource/java/util/Makefile.am
index edfe7bdb6..8a1742d43 100644
--- a/resource/java/util/Makefile.am
+++ b/resource/java/util/Makefile.am
@@ -2,9 +2,11 @@
EXTRA_DIST = \
iso3166-a3.properties \
+iso3166_de.properties \
iso3166.properties \
iso639-a2-old.properties \
iso639-a3.properties \
+iso639_de.properties \
iso639.properties \
iso639_fr.properties \
iso639_ga.properties