From 9d141fe8614046e95df8d27926f397cd4d297db8 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 28 Jun 2005 13:52:44 +0000
Subject: [PATCH] exe.mk: Split defs and rules -> ldlibpath.mk, rules.mk

Push LD_LIBRARY_PATH defs from exe.mk into ldlibpath.mk, and rules
into rules.mk.
---
 make/exe.mk       | 6 +-----
 make/ldlibpath.mk | 7 +++++++
 make/rules.mk     | 3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 make/ldlibpath.mk

diff --git a/make/exe.mk b/make/exe.mk
index a3f0029a..233f626b 100644
--- a/make/exe.mk
+++ b/make/exe.mk
@@ -9,9 +9,7 @@ endif
 
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
-
-LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH)
-export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::/:/g')
+include $(MODDIR)/make/ldlibpath.mk
 
 all: $(EXE) $(EXE_BIN)
 install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)
@@ -22,8 +20,6 @@ strace: $(EXE) $(EXE_BIN)
 kdbg gdb ddd:
 	rm -f $(CORE); make run; $@ $(EXE) $(firstword $(CORE))
 clean: execlean localclean
-libpath:
-	@echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"
 
 $(LIB_SO): $(LIB_A)
 $(EXE): $(LIB_SO)
diff --git a/make/ldlibpath.mk b/make/ldlibpath.mk
new file mode 100644
index 00000000..5c7e6fcb
--- /dev/null
+++ b/make/ldlibpath.mk
@@ -0,0 +1,7 @@
+# jan's utility modules  
+# (c) 2001-2005 jannet it services
+# contact@jannet.de
+# $Id$
+
+LD_LIB_PATH_ORIG := $(LD_LIBRARY_PATH)
+export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH):$(LD_LIB_PATH_ORIG)) | sed 's/ /:/g; s/::/:/g')
diff --git a/make/rules.mk b/make/rules.mk
index ba5c4d31..9a58aeef 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -267,3 +267,6 @@ prepend_header:
 
 remake:
 	make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS)) 
+
+libpath:
+	@echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"