X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/237602b9903d51a9b3de50e5ff9fed0289118be4..dcad31e1921b598a7caa7cc7dab5a8145aa22765:/tools/make/configure

diff --git a/tools/make/configure b/tools/make/configure
index f83750e..acf16cb 100755
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -3,22 +3,28 @@ set -e
 
 function echo_usage {
 	echo "usage: configure [options] <package>"
-	echo "	-a <arch>"
-	echo "  -b : extern build in ../build directory"
-	echo "  -c <compile_dir>"
-	echo "	-C <cross environment>"
-	echo "	-i : install dir. default: /"
-	echo "	-I : print this info"
-	echo "  -t <compile type: NONE, CPP, CMAKE, PDF> default: NONE"
-	echo "	-v : set version"
-	echo "	-V : version set by project"
+	echo "--- general options ---"
+	echo "  -h : print this info"
+	echo "--- compile options ---"
+	echo "  -a <arch>"
+	echo "  -c <compile type: NONE|CPP|CMAKE|PDF|ANY> default: NONE"
+	echo "  -C <cross environment>"
+	echo "  -d <compile_dir>"
+	echo "  -e <compile_target>"
+	echo "--- build target options ---"
+	echo "  -i : install dir. default: /, nec. for make install"
+	echo "  -n <target_name>: default: <package>"
+	echo "  -t <target_type: FILE|DEB|ZIP>, nec. for make pack"
+	echo "  -v : set version"
+	echo "  -V : version set by project"
 }
 
 function create_build {
 	pushd $BUILD_DIR >/dev/null
 		if [ "$compile_type" == "PDF" ]
 		then
-			echo "make $compile_target" > debian/$paket.build
+			echo "cd $compile_dir" >  debian/$paket.build
+			echo "make $compile_target" >> debian/$paket.build
 			chmod 755 debian/$paket.build
 		else
 			echo "build for compile_type not implemented."
@@ -138,6 +144,23 @@ function check_version {
 	fi
 }
 
+function add_sources {
+	echo "Anz: $#"
+	for suf in $*
+	do
+		find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
+	done
+	if [ $# -eq 2 ]
+	then
+		rm make.tmp || true
+		find . -name "*.$2" -exec echo {} >> make.tmp \;
+		while read line
+		do
+			echo "  ${line/\.$2/\.$1}  \\" >> make.pre
+		done < make.tmp
+	fi
+}
+
 ##############################################################################
 # Main program
 ##############################################################################
@@ -148,23 +171,29 @@ extern_build=0
 
 while [ $OPTIND -le "$#" ]
 do
-	if getopts "a:bB:C:i:It:v:V" opt
+	if getopts "ha:bc:C:d:e:i:n:t:v:V" opt
 	then
 		case $opt in
+			h)	echo_usage
+				exit 0
+				;;
 			a) ARCH=$OPTARG
 				;;
 			b) extern_build=1
 				;;
-			c) compile_dir=$OPTARG
+			c) compile_type=$OPTARG
 				;;
 			C) cross=$OPTARG
 				;;
+			d) compile_dir=$OPTARG
+				;;
+			d) compile_target=$OPTARG
+				;;
 			i)	install_dir=$OPTARG
 				;;
-			I)	echo_usage
-				exit 0
+			n)	target_name=$OPTARG
 				;;
-			t) compile_type=$OPTARG
+			t) target_type=$OPTARG
 				;;
 			v)	optversion=$OPTARG
 				;;
@@ -328,23 +357,30 @@ else
 	fi
 
 	# .build
-	if [ "$compile_type" != "CMAKE" -a "$compile_type" != "OLD" ]
+	if [ "$compile_type" != "CMAKE" -a "$compile_type" != "ANY" ]
 	then
 		cp debian/rules.pre $BUILD_DIR/$compile_dir/make.pre
 		pushd $BUILD_DIR/$compile_dir >/dev/null
 			ln -sf /usr/share/mbuild/makefile .
-			if [ -n "$sources_suffix" ]
-			then
-				echo "SOURCES = \\" >> make.pre
-				for suf in $sources_suffix
-				do
-					find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
-				done
-				echo >> make.pre
+#			if [ -n "$sources_suffix" ]
+#			then
+#				echo "SOURCES = \\" >> make.pre
+#				for suf in $sources_suffix
+#				do
+#					find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
+#				done
+#				echo >> make.pre
 			fi
 		popd >/dev/null
 	fi
-		
+
+	if [ "$compile_type" == "PDF" ]
+	then
+		pushd $BUILD_DIR/$compile_dir >/dev/null
+			echo "SOURCES = \\" >> make.pre
+			add_sources tex xml
+			echo >> make.pre
+		popd >/dev/null
 	if [ -x debian/$paket.prebuild ]
 	then
 		pushd $BUILD_DIR >/dev/null