diff --git a/Makefile.defs b/Makefile.defs index e7240fb1..2e438ce6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -53,6 +53,22 @@ LDFLAGS += -lm OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]") +ifdef USE_SPANDSP +ifneq ($(spandsp_defs), 1) +spandsp_defs=1 +export spandsp_defs +CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS +endif +endif + +ifdef USE_LIBSAMPLERATE +ifneq ($(libsrc_defs), 1) +libsrc_defs=1 +export libsrc_defs +CPPFLAGS += -DUSE_LIBSAMPLERATE +endif +endif + # Additions for Solaris support. ifeq ($(OS),solaris) GETARCH=uname -p diff --git a/core/Makefile b/core/Makefile index b43a9e52..e3734d51 100644 --- a/core/Makefile +++ b/core/Makefile @@ -55,23 +55,9 @@ LDFLAGS += -lspandsp endif endif - -ifdef USE_SPANDSP -ifneq ($(spandsp_defs), 1) -spandsp_defs=1 -export spandsp_defs -CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -endif -endif - ifdef USE_LIBSAMPLERATE -ifneq ($(libsrc_defs), 1) -libsrc_defs=1 -export libsrc_defs -CPPFLAGS += -DUSE_LIBSAMPLERATE LDFLAGS +=-lsamplerate endif -endif ifdef WITH_ZRTP LDFLAGS +=-lzrtp -lbn diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index d3b66a79..8b7acaab 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -10,11 +10,6 @@ CFLAGS += $(module_cflags) CPPFLAGS += $(module_cflags) CXXFLAGS += $(module_cflags) -ifdef USE_LIBSAMPLERATE -CPPFLAGS += -DUSE_LIBSAMPLERATE -LDFLAGS +=-lsamplerate -endif - app_module_dir = $(COREPATH)/lib lib_name = $(plug_in_name).so