--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/22 00:07:32	204
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/10/02 14:23:11	253
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -512,7 +512,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.37 2005-10-02 14:23:11 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -527,6 +527,11 @@
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
+
+	# echo MAGE_TARGETS ## note -target is needed !
+	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
+	echo >> ${dest}
+
 	# add special vars
 	if [ -n "${SPECIAL_VARS}" ]
 	then
@@ -538,6 +543,7 @@
 		done
 		echo  >> ${dest}
 	fi
+
 	# add at least all includes
 	if [ -n "${INHERITS}" ]
 	then
@@ -567,6 +573,7 @@
 		do
 			# add to mage (quotes needed !)
 			typeset -f "${i}" >> ${dest}
+			echo >> ${dest}
 			# unset to be safe (quotes needed !)
 			#unset "${i}" <-- later to get every target built
 		done
@@ -582,9 +589,6 @@
 	echo  >> ${dest}
 	typeset -f postremove >> ${dest}
 	echo  >> ${dest}
-
-	# echo MAGE_TARGETS ## note -target is needed !
-	echo "MAGE_TARGETS=\"${targets}\"" >> ${dest}
 }
 
 regen_mage_tree()
@@ -640,6 +644,28 @@
 	unset postremove
 }
 
+export_inherits()
+{
+	local include="$1"
+	shift
+
+	while [ "$1" ]
+	do
+		local functions="$1"
+
+		# sanity checks
+		[ -z "${include}" ] && die "export_inherits(): \$include not given."
+		[ -z "${functions}" ] && die "export_inherits(): \$functions not given."
+
+		eval "${functions}() { ${include}_${functions} ; }"
+
+		# debug
+		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+
+		shift
+	done
+}
+
 # print out our version
 showversion
 echo