# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1224011304 14400
# Node ID d5201ed0410a564085def4277594ccecc954becb
# Parent  81e9c55169c454b52bd5b1755748eea46e4c7391
2008-10-14 Omair Majid <omajid@redhat.com>

    * .hgignore: Added pulse-java.jar to ignore list.
    * Makefile.am: Move jni-common.o out of the way when done.

diff -r 81e9c55169c4 -r d5201ed0410a .hgignore
--- a/.hgignore	Tue Oct 14 13:29:55 2008 -0400
+++ b/.hgignore	Tue Oct 14 15:08:24 2008 -0400
@@ -445,3 +445,4 @@
 pulseaudio/.*\.o
 pulseaudio/src/native/org_.*.h
 pulseaudio/.*jar
+pulse-java.jar
diff -r 81e9c55169c4 -r d5201ed0410a ChangeLog
--- a/ChangeLog	Tue Oct 14 13:29:55 2008 -0400
+++ b/ChangeLog	Tue Oct 14 15:08:24 2008 -0400
@@ -1,3 +1,8 @@
+2008-10-14 Omair Majid <omajid@redhat.com>
+	
+	* .hgignore: Added pulse-java.jar to ignore list.
+	* Makefile.am: Move jni-common.o out of the way when done.
+
 2008-10-14 Omair Majid <omajid@redhat.com>
 
 	* Makefile.am (stamps/pulse-java.stamp): Added
diff -r 81e9c55169c4 -r d5201ed0410a Makefile.am
--- a/Makefile.am	Tue Oct 14 13:29:55 2008 -0400
+++ b/Makefile.am	Tue Oct 14 15:08:24 2008 -0400
@@ -1429,6 +1429,7 @@
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(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)
+	mv jni-common.o $(PULSE_JAVA_CLASS_DIR)
 endif
 	mkdir -p stamps
 	touch stamps/pulse-java.stamp