diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
| commit | 79115259a81dc958041f18573f34299c083cebea (patch) | |
| tree | 594fbf60dc01e2aa78c775c4e2d9977c5b18752f /toxdns/Makefile.inc | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'toxdns/Makefile.inc')
| -rw-r--r-- | toxdns/Makefile.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/toxdns/Makefile.inc b/toxdns/Makefile.inc index 1e66ab3f..689a58a5 100644 --- a/toxdns/Makefile.inc +++ b/toxdns/Makefile.inc | |||
| @@ -25,4 +25,5 @@ libtoxdns_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \ | |||
| 25 | libtoxdns_la_LIBADD = $(LIBSODIUM_LIBS) \ | 25 | libtoxdns_la_LIBADD = $(LIBSODIUM_LIBS) \ |
| 26 | $(NACL_OBJECTS) \ | 26 | $(NACL_OBJECTS) \ |
| 27 | $(NAC_LIBS) \ | 27 | $(NAC_LIBS) \ |
| 28 | $(PTHREAD_LIBS) | 28 | $(PTHREAD_LIBS) \ |
| 29 | libtoxcore.la | ||