diff options
author | 11rcombs <rodger.combs@gmail.com> | 2014-02-23 19:39:45 -0600 |
---|---|---|
committer | Grigori Goronzy <greg@chown.ath.cx> | 2014-02-24 21:00:59 +0100 |
commit | 363cd08c16bee4812cc5408b469e22d2bcd3b942 (patch) | |
tree | f2f6b8e506eadb6c93f9fe778a0552ea396bc9e7 /libass | |
parent | a9af0d84f390dbfb75ec85bbdb2dbb46ebef23cf (diff) | |
download | libass-363cd08c16bee4812cc5408b469e22d2bcd3b942.tar.bz2 libass-363cd08c16bee4812cc5408b469e22d2bcd3b942.tar.xz |
Redesigned configure/Makefile setup
Adds yasm version check and handles Free/OpenBSD/win32 correctly.
Signed-off-by: Grigori Goronzy <greg@chown.ath.cx>
Diffstat (limited to 'libass')
-rw-r--r-- | libass/Makefile.am | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index 079b9d2..7b4a0bf 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -6,11 +6,12 @@ LIBASS_LT_CURRENT = 5 LIBASS_LT_REVISION = 0 LIBASS_LT_AGE = 0 -.asm.lo: - $(LIBTOOL) --quiet --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic +yasm_verbose = $(yasm_verbose_$(V)) +yasm_verbose_ = $(yasm_verbose_$(AM_DEFAULT_VERBOSITY)) +yasm_verbose_0 = @echo " YASM " $@; -.S.lo: - $(LIBTOOL) --quiet --mode=compile $(AS) $(ASFLAGS)-o $@ $< -prefer-non-pic +.asm.lo: + $(yasm_verbose)$(LIBTOOL) $(AM_V_lt) --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic SRC_INTEL = x86/blend_bitmaps.asm x86/cpuid.asm x86/blend_bitmaps.h x86/cpuid.h SRC_INTEL64 = x86/be_blur.asm x86/be_blur.h @@ -29,32 +30,9 @@ libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym if ASM if INTEL -AS = "yasm" libass_la_SOURCES += $(SRC_INTEL) -if X86 -ASFLAGS += -DARCH_X86_64=0 -m x86 -if MACHO -ASFLAGS += -f macho32 -DPREFIX -DHAVE_ALIGNED_STACK=1 -endif -if ELF -ASFLAGS += -f elf -DHAVE_ALIGNED_STACK=1 -endif -if WIN32 -ASFLAGS += -f win32 -DPREFIX -DHAVE_ALIGNED_STACK=0 -endif -endif if X64 libass_la_SOURCES += $(SRC_INTEL64) -ASFLAGS += -DARCH_X86_64=1 -m amd64 -if MACHO -ASFLAGS += -f macho64 -DPREFIX -DHAVE_ALIGNED_STACK=1 -endif -if ELF -ASFLAGS += -f elf -DHAVE_ALIGNED_STACK=1 -endif -if WIN32 -ASFLAGS += -f win64 -DHAVE_ALIGNED_STACK=1 -endif endif endif endif |