diff options
author | Guilhem Lavaux <guilhem@kaffe.org> | 2005-10-23 16:59:05 +0000 |
---|---|---|
committer | Guilhem Lavaux <guilhem@kaffe.org> | 2005-10-23 16:59:05 +0000 |
commit | 9a7837a68f134a863077d65ccc697b576c564040 (patch) | |
tree | 30288b56eb4ce1ab8a4556f5fa368bb197a48cc1 /native | |
parent | d29dd0e7d03136b3c2d2e8d0df67b65845182ee6 (diff) | |
download | classpath-9a7837a68f134a863077d65ccc697b576c564040.tar.gz |
2005-10-23 Guilhem Lavaux <guilhem@kaffe.org>
* configure.ac: Added support for "--with-native-libdir" and
"--with-glibj-dir". Generate copy-vmresources.sh
* lib/Makefile.am: Call copy-vmresources.sh to fetch possible vm
resources from the vmdirs.
* lib/copy-vmresources.sh.in: New script file.
* lib/gen-classlist.sh.in: Include com/ as base package for the
vm directories.
* native/jawt/Makefile.am,
native/jni/gtk-peer/Makefile.am,
native/jni/java-io/Makefile.am,
native/jni/java-lang/Makefile.am,
native/jni/java-net/Makefile.am,
native/jni/java-nio/Makefile.am,
native/jni/java-util/Makefile.am,
native/jni/midi-alsa/Makefile.am,
native/jni/midi-dssi/Makefile.am,
native/jni/qt-peer/Makefile.am,
native/jni/xmlj/Makefile.am: Install libraries in nativelibdir
and not pkglib.
Diffstat (limited to 'native')
-rw-r--r-- | native/jawt/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/gtk-peer/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/java-io/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/java-lang/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/java-net/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/java-nio/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/java-util/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/midi-alsa/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/midi-dssi/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/qt-peer/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/xmlj/Makefile.am | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am index 9caa03d47..6c5c871b8 100644 --- a/native/jawt/Makefile.am +++ b/native/jawt/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjawtgnu.la +nativelib_LTLIBRARIES = libjawtgnu.la libjawtgnu_la_SOURCES = jawt.c libjawtgnu_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index b32162fc9..bb947424c 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libgtkpeer.la +nativelib_LTLIBRARIES = libgtkpeer.la # Gtk/Cairo JNI sources. if GTK_CAIRO diff --git a/native/jni/java-io/Makefile.am b/native/jni/java-io/Makefile.am index 5ed8a1baf..efa7d5688 100644 --- a/native/jni/java-io/Makefile.am +++ b/native/jni/java-io/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjavaio.la +nativelib_LTLIBRARIES = libjavaio.la libjavaio_la_SOURCES = javaio.h \ javaio.c \ diff --git a/native/jni/java-lang/Makefile.am b/native/jni/java-lang/Makefile.am index 34ffe00fb..fb8390f08 100644 --- a/native/jni/java-lang/Makefile.am +++ b/native/jni/java-lang/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjavalang.la libjavalangreflect.la +nativelib_LTLIBRARIES = libjavalang.la libjavalangreflect.la libjavalang_la_SOURCES = java_lang_VMSystem.c \ java_lang_VMFloat.c \ diff --git a/native/jni/java-net/Makefile.am b/native/jni/java-net/Makefile.am index 3e8c863a9..bf7a92bbf 100644 --- a/native/jni/java-net/Makefile.am +++ b/native/jni/java-net/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjavanet.la +nativelib_LTLIBRARIES = libjavanet.la libjavanet_la_SOURCES = javanet.c \ javanet.h \ diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am index 9785fee6d..8fd5ba3ae 100644 --- a/native/jni/java-nio/Makefile.am +++ b/native/jni/java-nio/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjavanio.la +nativelib_LTLIBRARIES = libjavanio.la libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \ gnu_java_nio_VMSelector.c \ diff --git a/native/jni/java-util/Makefile.am b/native/jni/java-util/Makefile.am index da617f6a2..148e9ccbe 100644 --- a/native/jni/java-util/Makefile.am +++ b/native/jni/java-util/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libjavautil.la +nativelib_LTLIBRARIES = libjavautil.la libjavautil_la_SOURCES = java_util_VMTimeZone.c diff --git a/native/jni/midi-alsa/Makefile.am b/native/jni/midi-alsa/Makefile.am index 5206dc979..b6498df2b 100644 --- a/native/jni/midi-alsa/Makefile.am +++ b/native/jni/midi-alsa/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libgjsmalsa.la +nativelib_LTLIBRARIES = libgjsmalsa.la libgjsmalsa_la_SOURCES = gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.c \ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \ diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am index edcab3041..58ee5c925 100644 --- a/native/jni/midi-dssi/Makefile.am +++ b/native/jni/midi-dssi/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libgjsmdssi.la +nativelib_LTLIBRARIES = libgjsmdssi.la libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \ gnu_javax_sound_midi_dssi_DSSISynthesizer.c diff --git a/native/jni/qt-peer/Makefile.am b/native/jni/qt-peer/Makefile.am index b2dc92979..031d58fee 100644 --- a/native/jni/qt-peer/Makefile.am +++ b/native/jni/qt-peer/Makefile.am @@ -1,7 +1,7 @@ # Qt AWT backend for Classpath # -pkglib_LTLIBRARIES = libqtpeer.la +nativelib_LTLIBRARIES = libqtpeer.la AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ diff --git a/native/jni/xmlj/Makefile.am b/native/jni/xmlj/Makefile.am index b0f1f9104..2cb914586 100644 --- a/native/jni/xmlj/Makefile.am +++ b/native/jni/xmlj/Makefile.am @@ -1,4 +1,4 @@ -pkglib_LTLIBRARIES = libxmlj.la +nativelib_LTLIBRARIES = libxmlj.la libxmlj_la_SOURCES = \ xmlj_dom.c \ |