mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Move ORC_SOURCE definitions outside of "if HAVE_ORC"

Browse source 
Not having ORC_SOURCE defined results in different tarballs depending on
whether the dev issuing 'make dist' has orc support enabled or disabled.

Specifying ORC_SOURCE unconditionally addresses that, without causing
negative effects on users not having orc in the end.
This commit is contained in:
Dominique Leuenberger 2014-01-24 21:45:52 +01:00 • committed by Tanu Kaskinen
parent 0779caf3e8
commit a360b29a0a
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
orc.mak
View file

@ -22,6 +22,7 @@
EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE)) EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE))
if HAVE_ORC
ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE))
ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE))
@ -44,3 +45,4 @@ cp_v_gen_0 = @echo " CP $@";
%-orc-gen.h: %.orc %-orc-gen.h: %.orc
@mkdir -p $(@D) @mkdir -p $(@D)
$(orcc_v_gen)$(ORCC) --header -o $@ $< $(orcc_v_gen)$(ORCC) --header -o $@ $<
endif

4
src/Makefile.am
View file

@ -932,8 +932,8 @@ libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS)
libpulsecore_@PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la libpulsecore_@PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la
endif endif
if HAVE_ORC
ORC_SOURCE += pulsecore/svolume ORC_SOURCE += pulsecore/svolume
if HAVE_ORC
libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c
nodist_libpulsecore_@PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h nodist_libpulsecore_@PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h
libpulsecore_@PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS) libpulsecore_@PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS)
@ -1950,8 +1950,8 @@ module_echo_cancel_la_SOURCES += \
modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1 module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1
if HAVE_ORC
ORC_SOURCE += modules/echo-cancel/adrian-aec ORC_SOURCE += modules/echo-cancel/adrian-aec
if HAVE_ORC
nodist_module_echo_cancel_la_SOURCES = \ nodist_module_echo_cancel_la_SOURCES = \
modules/echo-cancel/adrian-aec-orc-gen.c \ modules/echo-cancel/adrian-aec-orc-gen.c \
modules/echo-cancel/adrian-aec-orc-gen.h modules/echo-cancel/adrian-aec-orc-gen.h