summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Android.mk41
-rw-r--r--agent/Makefile.am10
-rw-r--r--configure.ac6
-rw-r--r--nice/Makefile.am12
l---------nice/agent.h1
-rw-r--r--nice/nice-uninstalled.pc.in7
-rw-r--r--random/Makefile.am9
-rw-r--r--socket/Makefile.am8
-rw-r--r--stun/Makefile.am10
10 files changed, 103 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 8ff43a1..9255497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Makefile.in
*.stamp
+Android.mk
aclocal.m4
autom4te.cache
autoregen.sh
@@ -104,6 +105,7 @@ nice/jingle-test-server
nice/test-readline
nice/test-util
nice/nice.pc
+nice/nice-uninstalled.pc
nice/libnice.symbols
# random/ stuff
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..95dbfb9
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,41 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+NICE_BUILT_SOURCES := \
+ nice/Android.mk \
+ agent/Android.mk \
+ random/Android.mk \
+ socket/Android.mk \
+ stun/Android.mk
+
+nice-configure-real:
+ cd $(NICE_TOP) ; \
+ CC="$(CONFIGURE_CC)" \
+ CFLAGS="$(CONFIGURE_CFLAGS)" \
+ LD=$(TARGET_LD) \
+ LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+ CPP=$(CONFIGURE_CPP) \
+ CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+ PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \
+ PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
+ ac_cv_have_abstract_sockets=no \
+ $(NICE_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
+ --disable-gtk-doc --without-gnome && \
+ for file in $(NICE_BUILT_SOURCES); do \
+ rm -f $$file && \
+ make -C $$(dirname $$file) $$(basename $$file) ; \
+ done
+
+nice-configure: nice-configure-real
+
+.PHONY: nice-configure
+
+CONFIGURE_TARGETS += nice-configure
+
+#include all the subdirs...
+-include $(NICE_TOP)/nice/Android.mk
+-include $(NICE_TOP)/agent/Android.mk
+-include $(NICE_TOP)/random/Android.mk
+-include $(NICE_TOP)/socket/Android.mk
+-include $(NICE_TOP)/stun/Android.mk
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 3a7e37f..0df68c7 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -71,3 +71,13 @@ libagent_la_DEPENDENCIES = \
$(top_builddir)/stun/libstun.la
pkginclude_HEADERS = agent.h candidate.h debug.h address.h interfaces.h pseudotcp.h
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+ androgenizer -:PROJECT nice -:STATIC agent -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libagent_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ -:LDFLAGS $(libagent_la_LIBADD) \
+ > $@
diff --git a/configure.ac b/configure.ac
index 7f7c359..ae15f6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ AC_CONFIG_FILES([
socket/Makefile
nice/Makefile
nice/nice.pc
+ nice/nice-uninstalled.pc
random/Makefile
gst/Makefile
docs/Makefile
@@ -62,9 +63,8 @@ AC_HEADER_ASSERT
AC_HEADER_STDBOOL
AC_DEFINE([_FORTIFY_SOURCE], [2], [Define to `2' to get GNU/libc warnings.])
AC_DEFINE([NICEAPI_EXPORT], [ ], [Public library function implementation])
-AC_CHECK_HEADERS([arpa/inet.h net/in.h ifaddrs.h], \
- [AC_DEFINE(HAVE_GETIFADDRS, [1], \
- [Whether getifaddrs() is available on the system])])
+AC_CHECK_HEADERS([arpa/inet.h net/in.h ifaddrs.h])
+AC_CHECK_FUNCS([getifaddrs])
LIBNICE_CFLAGS="-Wall"
dnl if asked for, add -Werror if supported
diff --git a/nice/Makefile.am b/nice/Makefile.am
index ce7f316..07b2c75 100644
--- a/nice/Makefile.am
+++ b/nice/Makefile.am
@@ -55,3 +55,15 @@ pkginclude_HEADERS = nice.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = nice.pc
+Android.mk: Makefile.am
+ androgenizer -:PROJECT nice -:SHARED nice -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libnice_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(libnice_la_CPPFLAGS) \
+ -:LDFLAGS $(libnice_la_LIBADD) $(libnice_la_LDFLAGS) \
+ -lstun -lnice-random -lsocket -lgcrypt \
+ -:LIBFILTER_WHOLE nice-random socket agent stun \
+ > $@
+
diff --git a/nice/agent.h b/nice/agent.h
new file mode 120000
index 0000000..5b2a1f8
--- /dev/null
+++ b/nice/agent.h
@@ -0,0 +1 @@
+../agent/agent.h \ No newline at end of file
diff --git a/nice/nice-uninstalled.pc.in b/nice/nice-uninstalled.pc.in
new file mode 100644
index 0000000..84f7320
--- /dev/null
+++ b/nice/nice-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: libnice
+Description: ICE library
+Requires: glib-2.0 >= 2.10.0
+Version: @VERSION@
+Libs: ${pcfiledir}/libnice.la @GLIB_LIBS@
+Cflags: @GLIB_CFLAGS@ -I${pcfiledir}/.. -I${pcfiledir}/../agent
+
diff --git a/random/Makefile.am b/random/Makefile.am
index 8d8ab82..9be5c30 100644
--- a/random/Makefile.am
+++ b/random/Makefile.am
@@ -24,3 +24,12 @@ test_LDADD = libnice-random.la $(GLIB_LIBS)
TESTS = $(check_PROGRAMS)
+Android.mk: Makefile.am
+ androgenizer -:PROJECT nice -:STATIC nice-random -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libnice_random_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ > $@
+
diff --git a/socket/Makefile.am b/socket/Makefile.am
index 9b5b006..5b382ca 100644
--- a/socket/Makefile.am
+++ b/socket/Makefile.am
@@ -37,4 +37,12 @@ libsocket_la_SOURCES = \
tcp-turn.h \
tcp-turn.c
+Android.mk: Makefile.am
+ androgenizer -:PROJECT nice -:STATIC socket -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libsocket_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ > $@
diff --git a/stun/Makefile.am b/stun/Makefile.am
index 0059187..99f8d69 100644
--- a/stun/Makefile.am
+++ b/stun/Makefile.am
@@ -40,3 +40,13 @@ libstun_la_include_HEADERS = stunagent.h stunmessage.h win32_common.h debug.h co
libstun_usage_includedir=$(includedir)/stun/usages
libstun_usage_include_HEADERS = usages/bind.h usages/ice.h usages/turn.h usages/timer.h
+
+Android.mk: Makefile.am
+ androgenizer -:PROJECT nice -:STATIC stun -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libstun_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ -:LDFLAGS $(libstun_la_LIBADD) \
+ > $@