Changeset 38925

Timestamp:

Oct 21, 2015, 10:10:32 AM (11 years ago)

Author:

eugene

Message:

parallel build for rotfont; clean up rotfont after done; fix namespace collision for rotfont

Location:

branches/eam_branches/ipp-20150625/Ohana/src/libkapa

Files:

• Makefile (modified) (1 diff)
• rotfont/Makefile (modified) (1 diff)
• rotfont/fontdimen.sh (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/Makefile

@@ -22 +22 @@
 
 ROTFONT:
-        cd rotfont && make all
+        cd rotfont && $(MAKE) all
 
 INCS = $(DESTINC)/kapa.h

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/rotfont/Makefile

@@ -33 +33 @@
 FONTS = $(TIMES) $(COURIER) $(HELVETICA) $(SYMBOL)
 
-all: fixfont $(FONTS)
+$(FONTS): fixfont
+
+all: $(FONTS)
 
 fixfont: fixfont.c

branches/eam_branches/ipp-20150625/Ohana/src/libkapa/rotfont/fontdimen.sh

@@ -19 +19 @@
   set fontsize = `echo $myFont | sed "s/$kpname[$i]//" | sed "s/.bdf//"`
   echo $kpname[$i] $psname[$i] $fontsize
-  cat fontsize.in.ps | sed "s/@FONTNAME@/$psname[$i]/" | sed "s/@FONTSIZE@/$fontsize/" > fontsize.ps
+  cat fontsize.in.ps | sed "s/@FONTNAME@/$psname[$i]/" | sed "s/@FONTSIZE@/$fontsize/" > $kpname[$i].$fontsize.ps
   if ($status) exit 1
 
-  ps2txt < fontsize.ps | awk -F, '{printf "%3d %5.2f\n", $1, $2}{printf "%3d %5.2f\n", $3, $4}' > $kpname[$i].$fontsize.psx
+  ps2txt < $kpname[$i].$fontsize.ps | awk -F, '{printf "%3d %5.2f\n", $1, $2}{printf "%3d %5.2f\n", $3, $4}' > $kpname[$i].$fontsize.psx
   if ($status) exit 1
 
   (./fixfont $kpname[$i]$fontsize.bdf $kpname[$i].$fontsize.psx $kpname[$i]$fontsize > $kpname[$i]$fontsize.h) >& /dev/null
   if ($status) exit 1
+
+  rm -f $kpname[$i].$fontsize.ps $kpname[$i].$fontsize.psx
   exit 0
 end