X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2Fbuildlib.sh;h=5362e8779bc001d22ac0094cb5d55723a8d5c52e;hb=99ab10072953cf340864184e8080b2f68f643215;hp=11a95018bfb17cb71bc47e29d5b3c30cc28d351a;hpb=325547c41c97f16f4f6d8a0c430caf68f7fb64b6;p=h316.git

diff --git a/lib/fortran/buildlib.sh b/lib/fortran/buildlib.sh
index 11a9501..5362e87 100755
--- a/lib/fortran/buildlib.sh
+++ b/lib/fortran/buildlib.sh
@@ -1,31 +1,20 @@
 #!/bin/bash
 
-# Here we find the recipes for the libraries.
-RECIPE_DIR=recipe
+if [ ! "$MAKE" ]; then
+    echo "Not run from within Makefile!"
+    exit 4
+fi
 
-# And their file suffix
-RECIPE_SUFFIX=.recipe
-
-# Here go the new libraries
-OUTPUT_DIR=./lib
-
-# This is needed as end-of-tape block for the loader
-ENDBLOCK=$H316/snippets/endseq
-
-# Where to get the original libraries:
-ORG_LIBDIR=original
-
-# And where to store the original objects
-ORG_OBJDIR=org
 
 # The suffix for library files (in and out)
 LIB_SUFFIX=.lib
 #######################################################################
-
+IFS="
+"
 
 # Clean everything up
 clean() {
-    rm -rf $OUTPUT_DIR $ORG_OBJDIR
+    rm -rf $LIB_DIR $ORG_OBJDIR
 }
 
 # Generate org directory containing the original library objects
@@ -41,31 +30,23 @@ make_org() {
 
 genlib(){
     echo "Library Builder start."
-    if [ ! -d "$OUTPUT_DIR" ]; then
-	echo -n "Creating $OUTPUT_DIR:"
-	mkdir  $OUTPUT_DIR && echo "Ok." || echo "FAILED!"
+    if [ ! -d "$LIB_DIR" ]; then
+	echo -n "Creating $LIB_DIR:"
+	mkdir  $LIB_DIR && echo "Ok." || echo "FAILED!"
     fi
     
-    
-    
-    RECIPE_LIST=`ls $RECIPE_DIR/*$RECIPE_SUFFIX`
-    for recipe in $RECIPE_LIST; do
-	lib=$OUTPUT_DIR/`basename $recipe $RECIPE_SUFFIX`$LIB_SUFFIX
+   # RECIPE_LIST=`ls $RECIPE_DIR/*$RECIPE_SUFFIX`
+   # for recipe in $RECIPE_LIST; do
+    recipe=$1
+    lib=$LIB_DIR/`basename $recipe $RECIPE_SUFFIX`$LIB_SUFFIX
 	echo "Building $lib:"
 	rm -f $lib
-	export IFS="
-"
-	for item in `cat $recipe`; do
-	    if echo $item| egrep -vq '^[[:space:]\t]*([#;])|(//).*'; then  
-		item=`echo $item | egrep -o '[^[:space:]].*$'`
-		echo "appending $item."
-		cat $item >> $lib || (echo "Error! could not find:$item")
-	    else
-		echo Ignoriere $item
-	    fi
+	for item in `cat $recipe| egrep -v '^[[:space:]]*(#.*)*$'`; do
+	    echo "appending $item."
+	    cat `echo $item| egrep -o '[^[:space:]].*[^[:space:]]'` >> $lib || (echo "Error! could not find:$item")
         done	
 	    cat $ENDBLOCK >> $lib
-    done
+    #done
 }
     
 
@@ -78,9 +59,9 @@ case $1 in
 	echo "Make org!"
 	make_org
     ;;
-    lib)
+    genlib)
 	echo "Build Lib!"
-	genlib
+	genlib  $2
     ;;
     *)
 	clean