[Flac-dev] [PATCH] nasm cleanup

[Josh Coalson]

yes, but then the Makefile.am has to change if the .lo format
changes, which makes me uneasy... not sure how often that happens
though.  also does the .lo faking logic work for all the same
platforms that libtool does?

Josh

--- Enrico Weigelt <weigelt at metux.de> wrote:

> 
> Hi folks,
> 
> here's a patch which cleans up the nasm call from Makefiles.
> Abusing libtool and then having to drop in some additional
> wrapper script to rewrite the commandline again is rather stupid.
> 
> cu
> -- 
> ---------------------------------------------------------------------
>  Enrico Weigelt    ==   metux IT service - http://www.metux.de/
> ---------------------------------------------------------------------
>  Please visit the OpenSource QM Taskforce:
>  	http://wiki.metux.de/public/OpenSource_QM_Taskforce
>  Patches / Fixes for a lot dozens of packages in dozens of versions:
> 	http://patches.metux.de/
> ---------------------------------------------------------------------
> > diff -ruN flac-1.1.2.orig/src/libFLAC/ia32/Makefile.am
> flac-1.1.2/src/libFLAC/ia32/Makefile.am
> --- flac-1.1.2.orig/src/libFLAC/ia32/Makefile.am	Tue Jan 25 05:14:14
> 2005
> +++ flac-1.1.2/src/libFLAC/ia32/Makefile.am	Thu Jul 27 04:53:34 2006
> @@ -30,10 +30,15 @@
>  
>  SUFFIXES = .nasm .lo
>  
> -STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
> -
>  .nasm.lo:
> -	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) $(NASM) -f
> $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
> +	mkdir -p .libs
> +	echo "# $@ - a libtool object file" > $@
> +	echo "# Generated by ltmain.sh - libtool fake" >> $@
> +	echo "#" >> $@
> +	echo "pic_object='.libs/$(@:.lo=.o)'" >> $@
> +	echo "non_pic_object='$(@:.lo=.o)'" >> $@
> +	$(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/
> $< -o .libs/$(@:.lo=.o)
> +	$(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/
> $< -o $(@:.lo=.o)
>  
>  noinst_LTLIBRARIES = libFLAC-asm.la
>  libFLAC_asm_la_SOURCES = \
> 



 
____________________________________________________________________________________
Any questions? Get answers on any topic at www.Answers.yahoo.com.  Try it now.