Mercurial > hg > release > icedtea7-2.0
changeset 2182:cc07055da3e2
Make sure PulseAudio headers are picked up by adding -I$(PULSE_JAVA_NATIVE_BUILDDIR)
2010-02-24 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Add missing pulse-java alias and reorganise
existing aliases alphabetically.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include
directive for build directory to pick up generated
headers.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Fri, 28 May 2010 17:26:04 +0100 |
parents | a389f4a8658c |
children | a0d045c13c13 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 28 17:22:46 2010 +0100 +++ b/ChangeLog Fri May 28 17:26:04 2010 +0100 @@ -1,3 +1,12 @@ +2010-02-24 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Add missing pulse-java alias and reorganise + existing aliases alphabetically. + ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include + directive for build directory to pick up generated + headers. + 2010-02-24 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Fri May 28 17:22:46 2010 +0100 +++ b/Makefile.am Fri May 28 17:26:04 2010 +0100 @@ -2251,7 +2251,7 @@ $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR) $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ - -o $@ -c $< + -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $< $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS) $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \ @@ -2824,14 +2824,14 @@ plugin-tests: stamps/plugin-tests.stamp +plugs: stamps/plugs.stamp + +pulse-java: $(PULSE_JAVA_TARGET) + rewriter: stamps/rewriter.stamp rewrite-rhino: stamps/rewrite-rhino.stamp -plugs: stamps/plugs.stamp - -pulse-java: $(PULSE_JAVA_TARGET) - rt: stamps/rt.stamp rt-class-files: stamps/rt-class-files.stamp