From 12b11721f530eaeae3f82f781f19e598ab2a2544 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@meshlink.io>
Date: Sun, 13 Apr 2014 13:19:06 +0200
Subject: [PATCH] Link meshlinkapp statically.

This makes it easier to run and copy around. The order of the included libraries had to be
changed to allow proper linking.
---
 meshlink-sample/Makefile | 2 +-
 src/tincd.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meshlink-sample/Makefile b/meshlink-sample/Makefile
index 128870a0..6c69ac8f 100644
--- a/meshlink-sample/Makefile
+++ b/meshlink-sample/Makefile
@@ -1,7 +1,7 @@
 # Simple Makefile
 
 CC=gcc
-LIBS= -lcrypto  -lz -llzo2 -ldl -lpthread -L../src/.libs/ -lmeshlink
+LIBS= -L../src/.libs/ -lmeshlink -lcrypto -lz -ldl -lpthread -static
 INCLUDE= -I../src/
 LOADLIBES= $(LIBS)
 OBJS= meshlinkapp.o
diff --git a/src/tincd.c b/src/tincd.c
index 6ff347de..32447056 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -147,7 +147,7 @@ static bool parse_options(int argc, char **argv) {
 	return true;
 }
 
-int main(int argc, char **argv) {
+int old_main(int argc, char **argv) {
 	if(!parse_options(argc, argv))
 		return 1;
 
-- 
2.39.5