[PATCH 5/6] Fix issue with parallel builds on i386. It seems both object files (.o files) and libtool files (.lo files) are never generated in .libs directory, so saying that pic/non-pic objects are in .libs directory seemed incorrect anyway.

Andres Mejia mcitadel at gmail.com
Mon Aug 1 17:55:29 UTC 2011


---
 libmp3lame/i386/Makefile.am |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libmp3lame/i386/Makefile.am b/libmp3lame/i386/Makefile.am
index a375225..295f1bc 100644
--- a/libmp3lame/i386/Makefile.am
+++ b/libmp3lame/i386/Makefile.am
@@ -53,11 +53,9 @@ NASMFLAGS=@NASM_FORMAT@ -i $(top_srcdir)/libmp3lame/@CPUTYPE@/
 	$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
 
 .nas.lo: $< nasm.h
-	mkdir -p .libs
-	$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
-	$(ECHO) "pic_object='.libs/$*.o'" >>$@
-	$(ECHO) "non_pic_object='.libs/$*.o'" >>$@
-	$(NASM) $(NASMFLAGS) $< -o .libs/$*.o -l $@.lst
+	$(ECHO) "pic_object='$*.o'" >>$@
+	$(ECHO) "non_pic_object='$*.o'" >>$@
+	$(NASM) $(NASMFLAGS) $< -o $*.o -l $@.lst
 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- 
1.7.5.4




More information about the pkg-multimedia-maintainers mailing list