Commit 3ce37d3a authored by Guillaume BIENKOWSKI's avatar Guillaume BIENKOWSKI

Modified the makefiles so that only 1 is needed.

Ditched the sdk/ subdir in the meantime.
parent 55f06a06
......@@ -16,4 +16,4 @@ build/
*.la
msisac.iss
m4/
webrtc/
EXTRA_DIST=autogen.sh msisac.iss.in
isac_VERSION = 1.0.0
isac_DIR=$(top_builddir)/sdk/webrtc
SUBDIRS = sdk
isac_DIR=$(top_builddir)/webrtc
# ISAC_FLAVOUR = main # use 'main' or 'fix'
ISAC_SRC_DIR = sdk/webrtc/modules/audio_coding/codecs/isac/$(ISAC_FLAVOUR)
ISAC_COMMON_DIR = sdk/webrtc/common_audio/signal_processing
ISAC_SRC_DIR = webrtc/modules/audio_coding/codecs/isac/$(ISAC_FLAVOUR)
ISAC_COMMON_DIR = webrtc/common_audio/signal_processing
pluginsdir = $(libdir)/mediastreamer/plugins
......@@ -108,6 +106,15 @@ endif
libmsisac_la_SOURCES= $(ISAC_BASE_SRCS) isac_dec.c isac_enc.c
webrtc_repo = git://git.linphone.org/webrtc
BUILT_SOURCES = $(isac_DIR)
GIT=$(shell which git)
$(isac_DIR):
$(GIT) clone $(webrtc_repo)
extract-sources: $(isac_DIR)
libmsisac_la_LIBADD=\
......@@ -118,7 +125,7 @@ libmsisac_la_LDFLAGS=-module -no-undefined
isac_CFLAGS = -I$(isac_DIR) \
-I$(ISAC_SRC_DIR)/source -I$(ISAC_SRC_DIR)/util -I$(ISAC_SRC_DIR)/interface \
-Isdk/webrtc/common_audio/signal_processing/include
-I$(ISAC_COMMON_DIR)/include
AM_CFLAGS= $(isac_CFLAGS) \
......
......@@ -120,7 +120,6 @@ fi
# Create the following files from their .in counterparts
AC_CONFIG_FILES([
Makefile
sdk/Makefile
msisac.iss
])
......
isac_dir = $(srcdir)/webrtc
webrtc_repo = git://git.linphone.org/webrtc
BUILT_SOURCES = $(isac_dir)
GIT=$(shell which git)
$(isac_dir):
$(GIT) clone $(webrtc_repo)
extract-sources: $(isac_dir)
# Call Skype Makefile to build the library
all-local: $(isac_dir)
# cd $(isac_dir) && $(MAKE) AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" CC="$(CC) $(CFLAGS)" LD="$(LD)" $(ISAC_MAKE_OPTIONS) $(AM_MAKEFLAGS) lib
check-local: $(isac_dir)
# cd $(isac_dir) && $(MAKE) $(AM_MAKEFLAGS) test
clean-local: $(isac_dir)
install-data-local: $(isac_dir)
distclean-local:
rm -rf $(isac_dir)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment