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. --- orc.mak | 2 ++ src/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/orc.mak b/orc.mak index 5a6ff96..a1069a7 100644 --- a/orc.mak +++ b/orc.mak @@ -22,6 +22,7 @@ EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE)) +if HAVE_ORC ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(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 @mkdir -p $(@D) $(orcc_v_gen)$(ORCC) --header -o $@ $< +endif diff --git a/src/Makefile.am b/src/Makefile.am index 0d3ab0b..857fda3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -932,8 +932,8 @@ libpulsecore_mix_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS) libpulsecore_ at PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la endif -if HAVE_ORC ORC_SOURCE += pulsecore/svolume +if HAVE_ORC libpulsecore_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c nodist_libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h libpulsecore_ at 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.c modules/echo-cancel/adrian.h module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1 -if HAVE_ORC ORC_SOURCE += modules/echo-cancel/adrian-aec +if HAVE_ORC nodist_module_echo_cancel_la_SOURCES = \ modules/echo-cancel/adrian-aec-orc-gen.c \ modules/echo-cancel/adrian-aec-orc-gen.h -- 1.8.5.2
