build: properly carry build flags

Fix build flags for two directories, clean globals.

Change-Id: I2c2fb1fd7f73c8097de05f641ad3e71ccbabd965
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>

globals.mk

@@ -6,14 +6,6 @@ ringlibdir=$(DESTDIR)$(libdir)/ring
 ASTYLERC="$(top_srcdir)/../astylerc"
 indent="/usr/bin/astyle"
 
-if BUILD_SPEEX
-SPEEXCODEC=-DHAVE_SPEEX_CODEC
-endif
-
-if BUILD_OPUS
-OPUSCODEC=-DHAVE_OPUS
-endif
-
 RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty)
 RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null)
 
@@ -31,10 +23,7 @@ AM_CPPFLAGS = \
 	-DRING_REVISION=\"$(RING_REVISION)\" \
 	-DRING_DIRTY_REPO=\"$(RING_DIRTY_REPO)\" \
 	-DPJSIP_MAX_PKT_LEN=8000 \
-	-DPJ_AUTOCONF=1 \
-	$(SPEEXCODEC) \
-	$(OPUSCODEC)
-
+	-DPJ_AUTOCONF=1
 
 indent:
 	@echo "Indenting code:"

src/config/Makefile.am

-noinst_LTLIBRARIES = libconfig.la
+include $(top_srcdir)/globals.mk
 
+noinst_LTLIBRARIES = libconfig.la
 libconfig_la_SOURCES = serializable.h yamlparser.h yamlparser.cpp
-
-libconfig_la_CXXFLAGS = -I $(top_srcdir)/src

src/ringdht/eth/libdevcrypto/Makefile.am

 include $(top_srcdir)/globals.mk
 
-AM_CPPFLAGS += -I../
+AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
 noinst_LTLIBRARIES = libdevcrypto.la
-libdevcrypto_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/src/ringdht/eth
+
 libdevcrypto_la_SOURCES = Common.cpp
 noinst_HEADERS = Common.h