summaryrefslogtreecommitdiff
path: root/toxcore/Makefile.inc
diff options
context:
space:
mode:
authorjin-eld <jin at mediatomb dot cc>2013-08-26 22:08:43 +0300
committerjin-eld <jin at mediatomb dot cc>2013-08-26 22:08:43 +0300
commited1c130ebced51e48b2a8c600e5f7e68fc54dd85 (patch)
tree4f0267dba2d4c6fb7d7694dccd93085b1c3e22b7 /toxcore/Makefile.inc
parent7ce599d1807d0d8e2e86f9691f52a59b48f2c9e6 (diff)
Move extra libtool options into configure
This should allow to keep the libtool options all in one place and at the same time define different options depending on the host. Made sure that -no-undefined is set only on Win32. Although no side effects on Linux and OSX have been observed so far, it's probably better to play it safe; it does not seem to be needed/does not seem to matter on *nix, only required for Win32.
Diffstat (limited to 'toxcore/Makefile.inc')
-rw-r--r--toxcore/Makefile.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index 90912a59..da07db41 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -1,5 +1,3 @@
1LIBTOXCORE_VERSION = 0:0:0
2
3lib_LTLIBRARIES = libtoxcore.la 1lib_LTLIBRARIES = libtoxcore.la
4 2
5libtoxcore_la_include_HEADERS = \ 3libtoxcore_la_include_HEADERS = \
@@ -33,8 +31,7 @@ libtoxcore_la_CFLAGS = -I$(top_srcdir) \
33 -I$(top_srcdir)/toxcore \ 31 -I$(top_srcdir)/toxcore \
34 $(LIBSODIUM_CFLAGS) 32 $(LIBSODIUM_CFLAGS)
35 33
36libtoxcore_la_LDFLAGS = -version-info $(LIBTOXCORE_VERSION) \ 34libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \
37 -no-undefined \
38 $(LIBSODIUM_LDFLAGS) \ 35 $(LIBSODIUM_LDFLAGS) \
39 $(WINSOCK2_LIBS) 36 $(WINSOCK2_LIBS)
40 37