Public header ready to go

author: mannol <eniz_vukovic@hotmail.com> 2014-02-15 20:44:33 +0100
committer: mannol <eniz_vukovic@hotmail.com> 2014-02-16 19:11:55 -0500
commit: 393433ce9910c3dffed9090c7965654f23a8e7a8 (patch)
tree: b96e08543fa3a647099cb6f3a9e55836453f51bc /toxav/Makefile.inc
parent: 292708c33634ee0b9a2243a2181018565558bc5c (diff)
1 files changed, 32 insertions, 102 deletions
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 \
+lib_LTLIBRARIES += libtoxav.la
-                   libtoxmsi.la \
+libtoxav_la_include_HEADERS = ../toxav/toxav.h
-                   libtoxmedia.la
+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 ****** #
+if BUILD_PHONE
-libtoxmedia_la_include_HEADERS = \
-                        ../toxav/toxmedia.h
-libtoxmedia_la_includedir = $(includedir)/tox
-libtoxmedia_la_SOURCES =  ../toxav/toxmedia.h \
-                          ../toxav/toxmedia.c 
-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) \
+                $(OPENAL_CFLAGS)
-                $(NACL_CFLAGS) \
-                $(OPUS_CFLAGS) 
-phone_LDADD =   libtoxrtp.la \
+phone_LDADD =   libtoxav.la \
-                libtoxmsi.la \
-                libtoxmedia.la  \
                libtoxcore.la \
-                $(NACL_LDFLAGS) \
                $(AVFORMAT_LIBS) \
                $(AVCODEC_LIBS) \
                $(AVUTIL_LIBS) \
                $(AVDEVICE_LIBS) \
                $(SWSCALE_LIBS) \
                $(SDL_LIBS) \
-                $(OPENAL_LIBS) \
+                $(OPENAL_LIBS)
-                $(NACL_LIBS) \
-                $(OPUS_LIBS)
                
                
 endif
 \ No newline at end of file
author	mannol <eniz_vukovic@hotmail.com>	2014-02-15 20:44:33 +0100
committer	mannol <eniz_vukovic@hotmail.com>	2014-02-16 19:11:55 -0500
commit	393433ce9910c3dffed9090c7965654f23a8e7a8 (patch)
tree	b96e08543fa3a647099cb6f3a9e55836453f51bc /toxav/Makefile.inc
parent	292708c33634ee0b9a2243a2181018565558bc5c (diff)

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 @@
1	if BUILD_AV	1	if BUILD_AV
2		2
3	lib_LTLIBRARIES += libtoxrtp.la \	3	lib_LTLIBRARIES += libtoxav.la
4	libtoxmsi.la \	4	libtoxav_la_include_HEADERS = ../toxav/toxav.h
5	libtoxmedia.la	5	libtoxav_la_includedir = $(includedir)/tox
		6
		7	libtoxav_la_SOURCES = ../toxav/rtp.h \
		8	../toxav/rtp.c \
		9	../toxav/msi.h \
		10	../toxav/msi.c \
		11	../toxav/media.h \
		12	../toxav/media.c \
		13	../toxav/toxav.h \
		14	../toxav/toxav.c
		15
		16
		17	libtoxav_la_CFLAGS = -I../toxcore \
		18	-I../toxav \
		19	$(NACL_CFLAGS) \
		20	$(OPUS_CFLAGS) \
		21	$(VPX_CFLAGS)
		22
		23	libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
		24	$(NACL_LDFLAGS) \
		25	$(EXTRA_LT_LDFLAGS)
		26
		27	libtoxav_la_LIBS = $(NACL_LIBS) \
		28	$(OPUS_LIBS) \
		29	$(VPX_LIBS)
6		30
7
8	# **** RTP **** #
9
10	libtoxrtp_la_include_HEADERS = \
11	../toxav/toxrtp.h
12
13	libtoxrtp_la_includedir = $(includedir)/tox
14
15	libtoxrtp_la_SOURCES = ../toxav/toxrtp.h \
16	../toxav/toxrtp.c
17
18	libtoxrtp_la_CFLAGS = -I../toxcore \
19	-I../toxav \
20	$(NACL_CFLAGS)
21
22	libtoxrtp_la_LDFLAGS = $(TOXRTP_LT_LDFLAGS) \
23	$(NACL_LDFLAGS) \
24	$(EXTRA_LT_LDFLAGS)
25
26	libtoxrtp_la_LIBS = libtoxcore.la \
27	$(NACL_LIBS)
28
29
30		31
		32	endif
31		33
32		34
33	# **** MSI **** #
34
35	libtoxmsi_la_include_HEADERS = \
36	../toxav/toxmsi.h
37
38	libtoxmsi_la_includedir = $(includedir)/tox
39
40	libtoxmsi_la_SOURCES = ../toxav/toxmsi.h \
41	../toxav/toxmsi.c
42
43	libtoxmsi_la_CFLAGS = -I../toxcore \
44	-I../toxav \
45	$(NACL_CFLAGS)
46
47	libtoxmsi_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \
48	$(EXTRA_LT_LDFLAGS) \
49	$(NACL_LDFLAGS)
50
51	libtoxmsi_la_LIBS = libtoxcore.la \
52	$(NACL_LIBS)
53
54		35
55		36
56		37
57		38
58	# **** MEDIA **** #	39	if BUILD_PHONE
59
60	libtoxmedia_la_include_HEADERS = \
61	../toxav/toxmedia.h
62
63	libtoxmedia_la_includedir = $(includedir)/tox
64
65	libtoxmedia_la_SOURCES = ../toxav/toxmedia.h \
66	../toxav/toxmedia.c
67		40
68	libtoxmedia_la_CFLAGS = -I../toxcore \
69	-I../toxav \
70	$(AVFORMAT_CFLAGS) \
71	$(AVCODEC_CFLAGS) \
72	$(AVUTIL_CFLAGS) \
73	$(AVDEVICE_CFLAGS) \
74	$(SWSCALE_CFLAGS) \
75	$(SDL_CFLAGS) \
76	$(OPENAL_CFLAGS) \
77	$(NACL_CFLAGS) \
78	$(OPUS_CFLAGS)
79
80
81	libtoxmedia_la_LDFLAGS = $(TOXMSI_LT_LDFLAGS) \
82	$(TOXRTP_LT_LDFLAGS) \
83	$(EXTRA_LT_LDFLAGS) \
84	$(NACL_LDFLAGS)
85
86
87	libtoxmedia_la_LIBS = libtoxcore.la \
88	$(NACL_LDFLAGS) \
89	$(AVFORMAT_LIBS) \
90	$(AVCODEC_LIBS) \
91	$(AVUTIL_LIBS) \
92	$(AVDEVICE_LIBS) \
93	$(SWSCALE_LIBS) \
94	$(SDL_LIBS) \
95	$(OPENAL_LIBS) \
96	$(NACL_LIBS) \
97	$(OPUS_LIBS)
98
99
100
101
102	# *** PHONE *** #
103		41
104	noinst_PROGRAMS += phone	42	noinst_PROGRAMS += phone
105		43
@@ -113,25 +51,17 @@ phone_CFLAGS = -I../toxcore \
113	$(AVDEVICE_CFLAGS) \	51	$(AVDEVICE_CFLAGS) \
114	$(SWSCALE_CFLAGS) \	52	$(SWSCALE_CFLAGS) \
115	$(SDL_CFLAGS) \	53	$(SDL_CFLAGS) \
116	$(OPENAL_CFLAGS) \	54	$(OPENAL_CFLAGS)
117	$(NACL_CFLAGS) \
118	$(OPUS_CFLAGS)
119
120		55
121	phone_LDADD = libtoxrtp.la \	56	phone_LDADD = libtoxav.la \
122	libtoxmsi.la \
123	libtoxmedia.la \
124	libtoxcore.la \	57	libtoxcore.la \
125	$(NACL_LDFLAGS) \
126	$(AVFORMAT_LIBS) \	58	$(AVFORMAT_LIBS) \
127	$(AVCODEC_LIBS) \	59	$(AVCODEC_LIBS) \
128	$(AVUTIL_LIBS) \	60	$(AVUTIL_LIBS) \
129	$(AVDEVICE_LIBS) \	61	$(AVDEVICE_LIBS) \
130	$(SWSCALE_LIBS) \	62	$(SWSCALE_LIBS) \
131	$(SDL_LIBS) \	63	$(SDL_LIBS) \
132	$(OPENAL_LIBS) \	64	$(OPENAL_LIBS)
133	$(NACL_LIBS) \
134	$(OPUS_LIBS)
135		65
136		66
137	endif \ No newline at end of file	67	endif \ No newline at end of file