From 393433ce9910c3dffed9090c7965654f23a8e7a8 Mon Sep 17 00:00:00 2001
From: mannol <eniz_vukovic@hotmail.com>
Date: Sat, 15 Feb 2014 20:44:33 +0100
Subject: Public header ready to go

---
 toxav/Makefile.inc | 134 +++++++++++++----------------------------------------
 1 file changed, 32 insertions(+), 102 deletions(-)

(limited to 'toxav/Makefile.inc')

diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 203d8a07..0472d361 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -1,105 +1,43 @@
 if BUILD_AV
 
-lib_LTLIBRARIES += libtoxrtp.la \
-                   libtoxmsi.la \
-                   libtoxmedia.la
+lib_LTLIBRARIES += libtoxav.la
+libtoxav_la_include_HEADERS = ../toxav/toxav.h
+libtoxav_la_includedir = $(includedir)/tox
+
+libtoxav_la_SOURCES = ../toxav/rtp.h \
+                      ../toxav/rtp.c \
+                      ../toxav/msi.h \
+                      ../toxav/msi.c \
+                      ../toxav/media.h \
+                      ../toxav/media.c \
+                      ../toxav/toxav.h \
+                      ../toxav/toxav.c
+
+
+libtoxav_la_CFLAGS = -I../toxcore \
+                     -I../toxav \
+                     $(NACL_CFLAGS) \
+                     $(OPUS_CFLAGS) \
+                     $(VPX_CFLAGS)
+
+libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
+                      $(NACL_LDFLAGS) \
+                      $(EXTRA_LT_LDFLAGS)
+                      
+libtoxav_la_LIBS =    $(NACL_LIBS) \
+                      $(OPUS_LIBS) \
+                      $(VPX_LIBS)
 
-                   
-# ****** RTP ****** #
-                   
-libtoxrtp_la_include_HEADERS = \
-                        ../toxav/toxrtp.h
-
-libtoxrtp_la_includedir = $(includedir)/tox
-
-libtoxrtp_la_SOURCES =  ../toxav/toxrtp.h \
-                        ../toxav/toxrtp.c 
-
-libtoxrtp_la_CFLAGS = -I../toxcore \
-                       -I../toxav \
-                       $(NACL_CFLAGS)
-
-libtoxrtp_la_LDFLAGS = $(TOXRTP_LT_LDFLAGS) \
-                       $(NACL_LDFLAGS) \
-                       $(EXTRA_LT_LDFLAGS)
-
-libtoxrtp_la_LIBS =    libtoxcore.la \
-                       $(NACL_LIBS)
-                        
-                        
                         
+endif
                         
                         
-# ****** MSI ****** #
-
-libtoxmsi_la_include_HEADERS = \
-                        ../toxav/toxmsi.h
-
-libtoxmsi_la_includedir = $(includedir)/tox
-
-libtoxmsi_la_SOURCES =  ../toxav/toxmsi.h \
-                        ../toxav/toxmsi.c 
-
-libtoxmsi_la_CFLAGS = -I../toxcore \
-                       -I../toxav \
-                       $(NACL_CFLAGS) 
-
-libtoxmsi_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \
-                       $(EXTRA_LT_LDFLAGS) \
-                       $(NACL_LDFLAGS) 
-
-libtoxmsi_la_LIBS =    libtoxcore.la \
-                       $(NACL_LIBS)
-                        
                         
                         
                         
                         
-# ****** MEDIA ****** #
-
-libtoxmedia_la_include_HEADERS = \
-                        ../toxav/toxmedia.h
-
-libtoxmedia_la_includedir = $(includedir)/tox
-
-libtoxmedia_la_SOURCES =  ../toxav/toxmedia.h \
-                          ../toxav/toxmedia.c 
+if BUILD_PHONE
 
-libtoxmedia_la_CFLAGS =   -I../toxcore \
-                          -I../toxav \
-                          $(AVFORMAT_CFLAGS) \
-                          $(AVCODEC_CFLAGS) \
-                          $(AVUTIL_CFLAGS) \
-                          $(AVDEVICE_CFLAGS) \
-                          $(SWSCALE_CFLAGS) \
-                          $(SDL_CFLAGS) \
-                          $(OPENAL_CFLAGS) \
-                          $(NACL_CFLAGS) \
-                          $(OPUS_CFLAGS) 
-
-                          
-libtoxmedia_la_LDFLAGS =  $(TOXMSI_LT_LDFLAGS) \
-                          $(TOXRTP_LT_LDFLAGS) \
-                          $(EXTRA_LT_LDFLAGS) \
-                          $(NACL_LDFLAGS) 
-                          
-                          
-libtoxmedia_la_LIBS =     libtoxcore.la \
-                          $(NACL_LDFLAGS) \
-                          $(AVFORMAT_LIBS) \
-                          $(AVCODEC_LIBS) \
-                          $(AVUTIL_LIBS) \
-                          $(AVDEVICE_LIBS) \
-                          $(SWSCALE_LIBS) \
-                          $(SDL_LIBS) \
-                          $(OPENAL_LIBS) \
-                          $(NACL_LIBS) \
-                          $(OPUS_LIBS)
-                          
-                          
-                          
-                          
-# ***** PHONE ***** #
                           
 noinst_PROGRAMS += phone
 
@@ -113,25 +51,17 @@ phone_CFLAGS = -I../toxcore \
                 $(AVDEVICE_CFLAGS) \
                 $(SWSCALE_CFLAGS) \
                 $(SDL_CFLAGS) \
-                $(OPENAL_CFLAGS) \
-                $(NACL_CFLAGS) \
-                $(OPUS_CFLAGS) 
-
+                $(OPENAL_CFLAGS)
 
-phone_LDADD =   libtoxrtp.la \
-                libtoxmsi.la \
-                libtoxmedia.la  \
+phone_LDADD =   libtoxav.la \
                 libtoxcore.la \
-                $(NACL_LDFLAGS) \
                 $(AVFORMAT_LIBS) \
                 $(AVCODEC_LIBS) \
                 $(AVUTIL_LIBS) \
                 $(AVDEVICE_LIBS) \
                 $(SWSCALE_LIBS) \
                 $(SDL_LIBS) \
-                $(OPENAL_LIBS) \
-                $(NACL_LIBS) \
-                $(OPUS_LIBS)
+                $(OPENAL_LIBS)
                 
                 
 endif
\ No newline at end of file
-- 
cgit v1.2.3