diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-01-30 22:16:14 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2004-01-30 22:16:14 +0000 |
| commit | 81d33591bb49dd9cd4dce79b61d4bd791f648d53 (patch) | |
| tree | 297bac504cdc345ca70d9c1656c782e6edf609d7 | |
| parent | cb642b3193481218af314042cfa4e6d6fa069793 (diff) | |
| download | classpath-81d33591bb49dd9cd4dce79b61d4bd791f648d53.tar.gz | |
2004-01-30 Michael Koch <konqueror@gmx.de>
* java/util/logging/Makefile.am: Include logging.properties in dist
tarball.
* native/jni/Makefile.am: Reworked subdir handling.
* native/Makefile.am: Likewise.
* resource/java/security/Makefile.am: Simplified classpath.security
handling.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | java/util/logging/Makefile.am | 4 | ||||
| -rw-r--r-- | native/Makefile.am | 15 | ||||
| -rw-r--r-- | native/jni/Makefile.am | 7 | ||||
| -rw-r--r-- | resource/java/security/Makefile.am | 11 |
5 files changed, 22 insertions, 24 deletions
@@ -1,5 +1,14 @@ 2004-01-30 Michael Koch <konqueror@gmx.de> + * java/util/logging/Makefile.am: Include logging.properties in dist + tarball. + * native/jni/Makefile.am: Reworked subdir handling. + * native/Makefile.am: Likewise. + * resource/java/security/Makefile.am: Simplified classpath.security + handling. + +2004-01-30 Michael Koch <konqueror@gmx.de> + * gnu/java/net/protocol/http/Connection.java (getOutputStream): Fixed typo. diff --git a/java/util/logging/Makefile.am b/java/util/logging/Makefile.am index 9f3b093b4..0b16bd3ce 100644 --- a/java/util/logging/Makefile.am +++ b/java/util/logging/Makefile.am @@ -1,9 +1,7 @@ ## Input file for automake to generate the Makefile.in used by configure -SUBDIRS = - propertiesdir = $(libdir) -properties_DATA = logging.properties +dist_properties_DATA = logging.properties EXTRA_DIST = \ ConsoleHandler.java \ diff --git a/native/Makefile.am b/native/Makefile.am index f1167a78c..2d284a0cb 100644 --- a/native/Makefile.am +++ b/native/Makefile.am @@ -1,16 +1,13 @@ ## Input file for automake to generate the Makefile.in used by configure -if CREATE_JNI_LIBRARIES - if CREATE_CNI_LIBRARIES -SUBDIRS = fdlibm cni jni target -else -SUBDIRS = fdlibm jni target + CNIDIR = cni endif -else -if CREATE_CNI_LIBRARIES -SUBDIRS = fdlibm cni target -endif +if CREATE_JNI_LIBRARIES + JNIDIR = jni endif +SUBDIRS = fdlibm $(CNIDIR) $(JNIDIR) target +DIST_SUBDIRS = fdlibm cni jni target + diff --git a/native/jni/Makefile.am b/native/jni/Makefile.am index b49254462..64b57f5e1 100644 --- a/native/jni/Makefile.am +++ b/native/jni/Makefile.am @@ -1,8 +1,9 @@ ## Input file for automake to generate the Makefile.in used by configure if CREATE_GTK_PEER_LIBRARIES -SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer -else -SUBDIRS = classpath java-io java-lang java-net java-nio java-util + GTKDIR = gtk-peer endif +SUBDIRS = classpath java-io java-lang java-net java-nio java-util $(GTKDIR) +DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer + diff --git a/resource/java/security/Makefile.am b/resource/java/security/Makefile.am index 83bc0f958..8f151042b 100644 --- a/resource/java/security/Makefile.am +++ b/resource/java/security/Makefile.am @@ -1,15 +1,8 @@ ## used by automake to generate Makefile.in -EXTRA_DIST = \ -classpath.security - # this may be a broken way to install, this file must be in # java.home/lib/security -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(libdir)/security - $(INSTALL_DATA) $(srcdir)/classpath.security $(DESTDIR)$(libdir)/security/classpath.security - -uninstall-local: - rm -f $(DESTDIR)$(libdir)/security/classpath.security +securitydir = $(libdir)/security +dist_security_DATA = classpath.security |