summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Audio.am
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-07-22 17:59:11 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-07-22 17:59:11 +0900
commit8f67f2f2d3e18219e7a88ce4ab008fc40122b59d (patch)
tree1366db8e870baa95426c2a283d7e476c802b46da /src/Makefile_Ecore_Audio.am
parenta311de5fe595690b51ad5486e3ae03ec7719d066 (diff)
ecore_audio headers conflict with app have ifdefs
Ecore_Audio.h had #ifdef HAVE_PULSE ... and that is just so wrong as this is something an ap[p may or may not set in its config.h ... but this certainly hase no place in our public headers. the api's there should always be there... symbols always... just imtplementation may be empty ... though ecore_audio doesnt build at all without pulse... so it's moot. so fix this build issue i found when fixing e build issues with meson changes etc. @fix
Diffstat (limited to 'src/Makefile_Ecore_Audio.am')
-rw-r--r--src/Makefile_Ecore_Audio.am12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index f57595f7f4..bd68dd6c4b 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -34,7 +34,10 @@ lib/ecore_audio/ecore_audio_obj.h \
34lib/ecore_audio/ecore_audio_obj_in.h \ 34lib/ecore_audio/ecore_audio_obj_in.h \
35lib/ecore_audio/ecore_audio_obj_out.h \ 35lib/ecore_audio/ecore_audio_obj_out.h \
36lib/ecore_audio/ecore_audio_obj_in_tone.h \ 36lib/ecore_audio/ecore_audio_obj_in_tone.h \
37lib/ecore_audio/ecore_audio_protected.h 37lib/ecore_audio/ecore_audio_protected.h \
38lib/ecore_audio/ecore_audio_obj_out_pulse.h \
39lib/ecore_audio/ecore_audio_obj_in_sndfile.h \
40lib/ecore_audio/ecore_audio_obj_out_sndfile.h
38 41
39nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h) 42nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h)
40 43
@@ -52,19 +55,12 @@ lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
52lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 55lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
53 56
54if HAVE_ECORE_AUDIO_PULSE 57if HAVE_ECORE_AUDIO_PULSE
55dist_installed_ecoreaudiomainheaders_DATA += \
56lib/ecore_audio/ecore_audio_obj_out_pulse.h
57
58lib_ecore_audio_libecore_audio_la_SOURCES += \ 58lib_ecore_audio_libecore_audio_la_SOURCES += \
59lib/ecore_audio/ecore_audio_pulse_ml.c \ 59lib/ecore_audio/ecore_audio_pulse_ml.c \
60lib/ecore_audio/ecore_audio_obj_out_pulse.c 60lib/ecore_audio/ecore_audio_obj_out_pulse.c
61endif 61endif
62 62
63if HAVE_ECORE_AUDIO_SNDFILE 63if HAVE_ECORE_AUDIO_SNDFILE
64dist_installed_ecoreaudiomainheaders_DATA += \
65lib/ecore_audio/ecore_audio_obj_in_sndfile.h \
66lib/ecore_audio/ecore_audio_obj_out_sndfile.h
67
68lib_ecore_audio_libecore_audio_la_SOURCES += \ 64lib_ecore_audio_libecore_audio_la_SOURCES += \
69lib/ecore_audio/ecore_audio_obj_in_sndfile.c \ 65lib/ecore_audio/ecore_audio_obj_in_sndfile.c \
70lib/ecore_audio/ecore_audio_obj_out_sndfile.c \ 66lib/ecore_audio/ecore_audio_obj_out_sndfile.c \