From: Michael Wagner <michael@wagnertech.de>
Date: Sun, 9 Sep 2018 19:37:57 +0000 (+0200)
Subject: posaune
X-Git-Tag: sysd2sysv_0.2-2~12
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e8baabd499d9d4ef551f89102424930c3185a4b3;p=projects.git

posaune
---

diff --git a/tools/make/c_configure.sh b/tools/make/c_configure.sh
index c7b610a..011d048 100755
--- a/tools/make/c_configure.sh
+++ b/tools/make/c_configure.sh
@@ -61,6 +61,16 @@ function add_include {
 	echo "CXXFLAGS += -I$src/$2" >> $1/make.pre
 }
 
+function add_library {
+# adds a extern library
+# parameter:
+# $1: main directory
+# $2: library name (without l or lib )
+
+	src=$(pwd)
+	echo "EXTLIB += -l$2" >> $1/make.pre
+}
+
 function append_library {
 # same as append_dependency. In addition a include statement + a link to the library is added to "main directory"
 # parameter:
diff --git a/tools/make/cpp.make b/tools/make/cpp.make
index 1b4d863..183afe4 100644
--- a/tools/make/cpp.make
+++ b/tools/make/cpp.make
@@ -19,5 +19,5 @@ clean:
 	ar r $(TARGET) *.o
 
 %.so: $(SOURCE:%.cpp=%.o) $(LDLIBS)
-	$(CXX) -shared -o $(TARGET) *.o $(LDLIBS)
+	$(CXX) -shared -o $(TARGET) *.o $(LDLIBS) $(EXTLIB)
 -include make.post
diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 438321e..7b6db95 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -166,7 +166,7 @@ then
 	# copy package control
 	if [ ! -f debian/control ]
 	then
-		control=$(find etc -name $paket.control)
+		control=$(find etc -name $paket.control) || true
 		if [ -z "$control" ]
 		then
 			echo "warning: control file not found"