[EGIT] [core/efl] master 02/02: ecore_audio headers conflict with app have ifdefs

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8f67f2f2d3e18219e7a88ce4ab008fc40122b59d

commit 8f67f2f2d3e18219e7a88ce4ab008fc40122b59d
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sat Jul 22 17:59:11 2017 +0900

    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
---
 src/Makefile_Ecore_Audio.am       | 12 ++++--------
 src/lib/ecore_audio/Ecore_Audio.h |  4 +---
 2 files changed, 5 insertions(+), 11 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 \
 lib/ecore_audio/ecore_audio_obj_in.h \
 lib/ecore_audio/ecore_audio_obj_out.h \
 lib/ecore_audio/ecore_audio_obj_in_tone.h \
-lib/ecore_audio/ecore_audio_protected.h
+lib/ecore_audio/ecore_audio_protected.h \
+lib/ecore_audio/ecore_audio_obj_out_pulse.h \
+lib/ecore_audio/ecore_audio_obj_in_sndfile.h \
+lib/ecore_audio/ecore_audio_obj_out_sndfile.h
 
 nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h)
 
@@ -52,19 +55,12 @@ lib_ecore_audio_libecore_audio_la_DEPENDENCIES = 
@ECORE_AUDIO_INTERNAL_LIBS@
 lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 if HAVE_ECORE_AUDIO_PULSE
-dist_installed_ecoreaudiomainheaders_DATA += \
-lib/ecore_audio/ecore_audio_obj_out_pulse.h
-
 lib_ecore_audio_libecore_audio_la_SOURCES += \
 lib/ecore_audio/ecore_audio_pulse_ml.c \
 lib/ecore_audio/ecore_audio_obj_out_pulse.c
 endif
 
 if HAVE_ECORE_AUDIO_SNDFILE
-dist_installed_ecoreaudiomainheaders_DATA += \
-lib/ecore_audio/ecore_audio_obj_in_sndfile.h \
-lib/ecore_audio/ecore_audio_obj_out_sndfile.h
-
 lib_ecore_audio_libecore_audio_la_SOURCES += \
 lib/ecore_audio/ecore_audio_obj_in_sndfile.c \
 lib/ecore_audio/ecore_audio_obj_out_sndfile.c \
diff --git a/src/lib/ecore_audio/Ecore_Audio.h 
b/src/lib/ecore_audio/Ecore_Audio.h
index af58822c59..0cc7bec29c 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -193,9 +193,7 @@ EAPI int                 ecore_audio_shutdown(void);
 
 #include <ecore_audio_obj_in_tone.h>
 
-#if HAVE_PULSE
-# include <ecore_audio_obj_out_pulse.h>
-#endif
+#include <ecore_audio_obj_out_pulse.h>
 
 /**
  * @}

--