search for: obj_format_

...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 "n...

...ving revision 1.7 diff -u -r1.7 Makefile.am --- src/libFLAC/ia32/Makefile.am 2001/07/22 07:26:58 1.7 +++ src/libFLAC/ia32/Makefile.am 2001/07/22 09:40:35 @@ -21,7 +21,7 @@ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh .nasm.lo: - $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ + $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -I $(srcdir)/ $< -o $@ noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \

...retrieving revision 1.5 diff -u -r1.5 Makefile.am --- ia32/Makefile.am 2001/07/16 18:04:19 1.5 +++ ia32/Makefile.am 2001/07/20 20:21:58 @@ -20,14 +20,13 @@ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh -.nasm.lo: - $(LIBTOOL) --tag=CC --mode=compile \ - $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< +.nasm.o: + $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< #@@@OLD RULE: $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ -noinst_LTLIBRARIES = libFLAC-asm.la -libFLAC_asm_la_SOURCES = \ +noinst_LIBRARIES = libFLAC-asm.a +libFLAC_asm_a_SOURCES = \...

...ckout from CVS and break it! > > > > > > Also, my libtool doesn't seem to recognize --tag=CC. What is its > > > purpose? > > > > > > /bin/sh ../../../libtool --tag=CC --mode=compile \ > > > sh ../../../strip_fPIC.sh nasm -f elf -d OBJ_FORMAT_elf > > > cpu_asm.nasm > > > libtool: unrecognized option `--tag=CC' > > > Try `libtool --help' for more information. > > > > My libtool errored with a message instructing me to specify a tag. > > I put --tag=CC just to make it compile, I don'...

...or SDL, so I guess we go back to src/libFLAC/ia32/Makefile.am version 1.5 (plus my automake patch). The libtool command line needs to be modified to use "-o $@", otherwise libtool gives the error: /bin/sh ../../../libtool --mode=compile \ sh ../../../strip_fPIC.sh nasm -f elf -d OBJ_FORMAT_elf cpu_asm.nasm libtool: compile: cannot determine name of library object from `cpu_asm.nasm' make: *** [cpu_asm.lo] Error 1 Changing the rule to: $(LIBTOOL) --mode=compile \ $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -o $@ $< fixes that, but we still have the i...

...lac/src/libFLAC/ia32/Makefile.am,v retrieving revision 1.6 diff -u -r1.6 Makefile.am --- src/libFLAC/ia32/Makefile.am 2001/07/20 23:46:09 1.6 +++ src/libFLAC/ia32/Makefile.am 2001/07/21 01:58:17 @@ -21,7 +21,7 @@ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh .nasm.o: - $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ + $(NASM) -f $(OBJ_FORMAT) -I $(srcdir)/ -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ # patch from Ben for the above rule that may be needed with new libtool: #.nasm.lo: @@ -32,4 +32,5 @@ libFLAC_asm_a_SOURCES = \ cpu_asm.nasm \ fixed_asm.nasm \ - lpc_asm.nasm + lpc_asm...

...e Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -SUFFIXES = .nasm .lo - STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh -.nasm.lo: - $(LIBTOOL) --tag=CC --mode=compile \ +%.lo: %.s + $(LIBTOOL) --mode=compile \ $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< #@@@OLD RULE: $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ - cpu_asm.nasm \ - fixed_asm.nasm \ - lpc_asm.nasm + cpu_asm.s \ + fixed_asm.s \ + lpc_asm.s

I rethought it and it seemed like a bad idea to post a big file, so you can get it here: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/flac/junk/flac-1.0-src-candidate.tar.bz2 Josh __________________________________________________ Do You Yahoo!? Get personalized email addresses from Yahoo! Mail http://personal.mail.yahoo.com/

...c/libFLAC/ia32/Makefile.am > version 1.5 > (plus my automake patch). The libtool command line needs to be > modified to > use "-o $@", otherwise libtool gives the error: > > /bin/sh ../../../libtool --mode=compile \ > sh ../../../strip_fPIC.sh nasm -f elf -d OBJ_FORMAT_elf > cpu_asm.nasm > libtool: compile: cannot determine name of library object from > `cpu_asm.nasm' > make: *** [cpu_asm.lo] Error 1 > > Changing the rule to: > > $(LIBTOOL) --mode=compile \ > $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) &gt...

...FLAC/ia32/Makefile.am @@ -31,7 +31,7 @@ SUFFIXES = .nasm .lo STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh - +AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include .nasm.lo: $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@ diff --git a/src/libFLAC/include/private/macros.h b/src/libFLAC/include/private/macros.h index b9989e1..5104dc9 100644 --- a/src/libFLAC/include/private/macros.h +++ b/src/libFLAC/include/private/macros.h @@ -57,4 +57,10 @@ #define flac_min(a,b) __min(a,b)...

...the output: Making all in src gmake[1]: Entering directory `/home/ben/flac/flac/flac/src' Making all in libFLAC gmake[2]: Entering directory `/home/ben/flac/flac/flac/src/libFLAC' Making all in ia32 gmake[3]: Entering directory `/home/ben/flac/flac/flac/src/libFLAC/ia32' nasm -f elf -d OBJ_FORMAT_elf cpu_asm.nasm -o cpu_asm.o nasm -f elf -d OBJ_FORMAT_elf fixed_asm.nasm -o fixed_asm.o nasm -f elf -d OBJ_FORMAT_elf lpc_asm.nasm -o lpc_asm.o rm -f libFLAC-asm.a ar cru libFLAC-asm.a cpu_asm.o fixed_asm.o lpc_asm.o ranlib libFLAC-asm.a gmake[3]: Leaving directory `/home/ben/flac/flac/flac/src/l...