From 07bc19ea4d8fd80a9a54b1ce3dda19abd2f4a592 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano.boppart@pep.security>
Date: Wed, 12 Dec 2018 00:23:54 +0100
Subject: [PATCH] Use canonical semantics for LD* variables

---
 src/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index cf2480a..56f4f5f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,6 +32,10 @@ else
     $(error I don't know how to build for $(BUILD_FOR).)
 endif
 
+LDFLAGS=-shared $(ENGINE_LIB) $(AD_LIB)
+
+LDLIBS=-lpEpEngine
+
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
     org/pEp/jniadapter/AbstractEngine.java \
     org/pEp/jniadapter/Message.java \
@@ -87,7 +91,7 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
 	ar -r $@ *.o
 
 $(SHARED): $(LIBRARY)
-	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
+	$(CXX) *.o $(LDFLAGS) $(LDLIBS) -o $@
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	$(YML2_PROC) -y gen_java_exceptions.ysl2 $< -o $@