changeset in /hg/icedtea6: 2008-10-11 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 64f23360289f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=64f23360289f
description:
	2008-10-11  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (stamps/pulse-java.stamp): Remove -fpic flag, add
	        -fPIC to build jni-common.c. (gcjwebplugin.so): Use -fPIC.

diffstat:

2 files changed, 10 insertions(+), 7 deletions(-)
ChangeLog   |    3 +++
Makefile.am |   14 +++++++-------

diffs (44 lines):

diff -r 72f37a7f8077 -r 64f23360289f ChangeLog
--- a/ChangeLog	Sat Oct 11 17:28:17 2008 +0200
+++ b/ChangeLog	Sat Oct 11 18:34:47 2008 +0200
@@ -2,6 +2,9 @@ 2008-10-11  Matthias Klose  <doko at ubuntu
 
 	* 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 at redhat.com>
 	* src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
diff -r 72f37a7f8077 -r 64f23360289f Makefile.am
--- 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 @@ gcjwebplugin.so: gcjwebplugin.cc
 	  $(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 @@ endif
 
 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