Skip to content

Commit

Permalink
Fix "make distcheck"
Browse files Browse the repository at this point in the history
  • Loading branch information
proski committed Oct 16, 2016
1 parent 845ee8c commit 12229f0
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 12 deletions.
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ SUBDIRS = \
src \
tests

include_HEADERS = \
include/rfxcodec_encode.h \
include/rfxcodec_decode.h \
include/rfxcodec_common.h
46 changes: 34 additions & 12 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXTRA_DIST =
EXTRA_DIST = $(AMD64_ASM) $(X86_ASM) nasm_lt.sh

EXTRA_DEFINES =
EXTRA_INCLUDES =
Expand All @@ -7,21 +7,27 @@ EXTRA_FLAGS =
EXTRA_SRC =
EXTRA_ENCODE_SRC =

if WITH_SIMD_AMD64
EXTRA_ENCODE_SRC += amd64/cpuid_amd64.asm \
AMD64_ASM = \
amd64/cpuid_amd64.asm \
amd64/rfxcodec_encode_diff_rlgr1_amd64_sse2.asm \
amd64/rfxcodec_encode_diff_rlgr3_amd64_sse2.asm \
amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm \
amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm
EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_AMD64=1
endif

if WITH_SIMD_X86
EXTRA_ENCODE_SRC += x86/cpuid_x86.asm \
X86_ASM = \
x86/cpuid_x86.asm \
x86/rfxcodec_encode_diff_rlgr1_x86_sse2.asm \
x86/rfxcodec_encode_diff_rlgr3_x86_sse2.asm \
x86/rfxcodec_encode_dwt_shift_x86_sse2.asm \
x86/rfxcodec_encode_dwt_shift_x86_sse41.asm

if WITH_SIMD_AMD64
EXTRA_ENCODE_SRC += $(AMD64_ASM)
EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_AMD64=1
endif

if WITH_SIMD_X86
EXTRA_ENCODE_SRC += $(X86_ASM)
EXTRA_DEFINES += -DSIMD_USE_ACCEL=1 -DRFX_USE_ACCEL_X86=1
endif

Expand All @@ -30,18 +36,37 @@ EXTRA_INCLUDES += -I$(prefix)/include
EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
endif

AM_CFLAGS = -I../include $(EXTRA_DEFINES)
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I../include \
$(EXTRA_DEFINES)

INCLUDES = $(EXTRA_INCLUDES)

noinst_HEADERS = \
rfx_bitstream.h \
rfxcommon.h \
rfxcompose.h \
rfxconstants.h \
rfxencode_alpha.h \
rfxencode_differential.h \
rfxencode_dwt.h \
rfxencode.h \
rfxencode_quantization.h \
rfxencode_rlgr1.h \
rfxencode_rlgr3.h \
rfxencode_tile.h \
amd64/funcs_amd64.h \
x86/funcs_x86.h

lib_LTLIBRARIES = librfxencode.la

librfxencode_la_LDFLAGS = $(EXTRA_FLAGS)


librfxencode_ladir = $(moduledir)

librfxencode_la_SOURCES = rfxencode.c \
librfxencode_la_SOURCES = $(noinst_HEADERS) rfxencode.c \
rfxcompose.c rfxencode_tile.c rfxencode_dwt.c \
rfxencode_quantization.c rfxencode_differential.c \
rfxencode_rlgr1.c rfxencode_rlgr3.c rfxencode_alpha.c $(EXTRA_ENCODE_SRC)
Expand All @@ -50,6 +75,3 @@ librfxencode_la_SOURCES = rfxencode.c \
$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@

librfxencode_la_LIBADD =

include_HEADERS = ../include/rfxcodec_encode.h

0 comments on commit 12229f0

Please sign in to comment.