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.

diff --git a/meshlink-sample/Makefile b/meshlink-sample/Makefile
index 128870a03b9ec90524efa52bfd72a69b88c4ce8e..6c69ac8f153f91d02059c7ae0bec52c8078c0235 100644 (file)
--- 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 6ff347deb3020fa4d08aaf1917472e2d7591107f..32447056d09e609ccc1fd94d451dd5d3ab44e6fa 100644 (file)
--- 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;