AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename strip_fPIC.sh to strip_non_asm_libtool_args.sh, as it takes on new duties stripping other arguments for other assemblers

Browse Source
This commit is contained in:
Josh Coalson 2004-07-29 06:43:23 +00:00
parent cce2f25a10
commit c2570659f2
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -45,6 +45,6 @@ EXTRA_DIST = \
config.rpath \ config.rpath \
depcomp \ depcomp \
ltmain.sh \ ltmain.sh \
strip_fPIC.sh strip_non_asm_libtool_args.sh
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign

3
src/libFLAC/Makefile.am
View File

@ -45,6 +45,7 @@ endif
if FLaC__CPU_PPC if FLaC__CPU_PPC
ARCH_SUBDIRS = ppc ARCH_SUBDIRS = ppc
libFLAC_la_LIBADD = ppc/libFLAC-asm.la libFLAC_la_LIBADD = ppc/libFLAC-asm.la
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
endif endif
endif endif
@ -60,7 +61,7 @@ EXTRA_DIST = \
libFLAC.m4 libFLAC.m4
# see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
libFLAC_la_LDFLAGS = -version-info 5:2:1 -lm libFLAC_la_LDFLAGS = -version-info 5:2:1 -lm $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \ libFLAC_la_SOURCES = \
bitbuffer.c \ bitbuffer.c \
bitmath.c \ bitmath.c \

4
src/libFLAC/ia32/Makefile.am
View File

@ -30,10 +30,10 @@
SUFFIXES = .nasm .lo SUFFIXES = .nasm .lo
STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
.nasm.lo: .nasm.lo:
$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@ $(LIBTOOL) --mode=compile $(STRIP_NON_ASM) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
noinst_LTLIBRARIES = libFLAC-asm.la noinst_LTLIBRARIES = libFLAC-asm.la
libFLAC_asm_la_SOURCES = \ libFLAC_asm_la_SOURCES = \

15
strip_fPIC.sh
View File

@ -1,15 +0,0 @@
#!/bin/sh
#
# libtool assumes that the compiler can handle the -fPIC flag
# This isn't always true (for example, nasm can't handle it)
command=""
while [ $1 ]; do
if [ "$1" != "-fPIC" ]; then
if [ "$1" != "-DPIC" ]; then
command="$command $1"
fi
fi
shift
done
echo $command
exec $command

19
strip_non_asm_libtool_args.sh Executable file
View File

@ -0,0 +1,19 @@
#!/bin/sh
#
# libtool assumes that the compiler can handle the -fPIC flag.
# This isn't always true (for example, nasm can't handle it).
# Also, on some versions of OS X it tries to pass -fno-common
# to 'as' which causes problems.
command=""
while [ $1 ]; do
if [ "$1" != "-fPIC" ]; then
if [ "$1" != "-DPIC" ]; then
if [ "$1" != "-fno-common" ]; then
command="$command $1"
fi
fi
fi
shift
done
echo $command
exec $command