commit 846c7965adafeba64cd9295d9cbc19fd7938beef
parent 25780ac17b330eb1359402544a577ab65d2f99d3
Author: Daniel Bainton <dpb@driftaway.org>
Date:   Mon, 26 May 2014 09:14:50 +0300
Move the library building to the .targs.mk file
Diffstat:
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/mk.build b/mk.build
@@ -6,17 +6,11 @@ LIB = `{ if test "$LIB" != ""; then echo $LIB; else echo "NOLIB"; fi }
 
 `{ printf "# Auto-generated file by mk, do not edit\n\n" > .targs.mk }
 `{ for i in $BIN; do tobj=$(echo $i|tr '.' '_'|tr '/' '_'); printf "$i:Q: \$"$tobj"_OBJ\n\techo LD \$target\n\t\$LD \$prereq \$LDFLAGS \$DEPS_LDFLAGS \$LOCAL_LDFLAGS \$"$tobj"_LDFLAGS \$LOCAL_BIN_LDFLAGS -o \$target\n\n" ; done >> .targs.mk }
-`{ for i in $LIB; do tobj=$(echo $i|tr '.' '_'|tr '/' '_'); printf "$i: \$"$tobj"_OBJ\n\n" ; done >> .targs.mk }
+`{ for i in $LIB; do tobj=$(echo $i|tr '.' '_'|tr '/' '_'); printf "$i:Q: \$"$tobj"_OBJ\n\techo AR \$target\n\t\$AR -rv \$target \$prereq\n\techo RANLIB \$target\n\t\$RANLIB \$target\n\n" ; done >> .targs.mk }
 <.targs.mk
 
 <$mkbuild/mk.deps
 
-&.a:Q:
-	echo AR $target
-	$AR -rv $target $prereq
-	echo RANLIB $target
-	$RANLIB $target
-
 %.o:Q: %.c
 	echo CC $stem.o
 	$CC $CFLAGS $DEPS_CFLAGS $LOCAL_CFLAGS $CPPFLAGS -c $stem.c -o $stem.o