Mercurial > hg > release > icedtea6-1.3
changeset 1084:64f23360289f
2008-10-11 Matthias Klose <doko@ubuntu.com>
* Makefile.am (stamps/pulse-java.stamp): Remove -fpic flag, add
-fPIC to build jni-common.c. (gcjwebplugin.so): Use -fPIC.
author | doko@ubuntu.com |
---|---|
date | Sat, 11 Oct 2008 18:34:47 +0200 |
parents | 72f37a7f8077 |
children | df8d2a8c69c8 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 11 17:28:17 2008 +0200 +++ b/ChangeLog Sat Oct 11 18:34:47 2008 +0200 @@ -3,6 +3,9 @@ * Makefile.am (clean-pulse-java): Don't rm -rf / if configuring without pulseaudio, remove jni-common.o. + * Makefile.am (stamps/pulse-java.stamp): Remove -fpic flag, add + -fPIC to build jni-common.c. (gcjwebplugin.so): Use -fPIC. + 2008-10-10 Ioana Ivan <iivan@redhat.com> * src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java (getLine): LineUnavailablException is no longer thrown if the mixer is
--- a/Makefile.am Sat Oct 11 17:28:17 2008 +0200 +++ b/Makefile.am Sat Oct 11 18:34:47 2008 +0200 @@ -1408,7 +1408,7 @@ $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ $(GTK_CFLAGS) $(GTK_LIBS) \ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ - -fpic -shared -o $@ $< + -fPIC -shared -o $@ $< clean-gcjwebplugin: rm -f gcjwebplugin.so @@ -1421,12 +1421,12 @@ stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp stamps/pulse-java-headers.stamp if ENABLE_PULSE_JAVA - $(CC) $(CFLAGS) -c $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c - $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c - $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c - $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c - $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c - $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fpic -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c + $(CC) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c + $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c + $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c + $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c + $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c + $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c $(CC) $(LDFLAGS) -shared $(LIBPULSE_LIBS) -o libpulse-java.so org_*pulseaudio*.o jni-common.o mv org_classpath_icedtea_pulseaudio_*.o $(PULSE_JAVA_CLASS_DIR) endif