X-Git-Url: http://git.shiar.nl/unifont.git/blobdiff_plain/119a78c606ce7e90f07f84f5307628fd5a0837f7..8e42f3d15c39e5c98149c9647c0cc1a318e9321a:/src/Makefile

diff --git a/src/Makefile b/src/Makefile
index 5ac2206..f3c1510 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,11 @@
 
-CFLAGS = -g -O -Wall
+SHELL = /bin/sh
 
-INSTALLBINDIR = ../bin
+CFLAGS   = -g -O2 -Wall
+
+LOCALBINDIR = ../bin
+
+VPATH = . $(LOCALBINDIR)
 
 #
 # $(PREFIX) is defined in top-level directory, so don't do a
@@ -21,31 +25,40 @@ CPROGS = unibmp2hex unicoverage unidup unibdf2hex unifontpic \
 # The programs johab2ucs2, unifontchojung, and unifontksx are
 # only used for generation of Hangul syllables.
 #
-PPROGS = bdfimplode hex2bdf hex2sfd hexbraille hexdraw hexmerge \
-	 johab2ucs2 unifontchojung unifontksx
+PPROGS = bdfimplode hex2bdf hex2sfd hexbraille hexdraw hexkinya hexmerge \
+	 johab2ucs2 unifontchojung unifontksx unihex2png unihexfill \
+	 unipng2hex unifont-viewer
 
 PROGS = $(CPROGS) $(PPROGS)
 
 
-all: $(CPROGS)
-	install    -m0755 -d $(INSTALLBINDIR)
-	install -s -m0755 $(CPROGS) $(INSTALLBINDIR)
-	install    -m0755 $(PPROGS) $(INSTALLBINDIR)
+all: $(CPROGS) bin
+
+.c:
+
+bin: bin-stamp
+
+bin-stamp: $(CPROGS) $(PPROGS) $(PNGPROGS)
+	install    -m0755 -d $(LOCALBINDIR)
+#	install    -m0755 $? $(LOCALBINDIR)
+	install -s -m0755 $(CPROGS) $(LOCALBINDIR)
+	install    -m0755 $(PPROGS) $(LOCALBINDIR)
 	\rm -f $(CPROGS)
+	touch $@
 
 install:
 	if [ x$(PREFIX) = x ] ; \
 	then \
-	   echo "Fatal error: PREFIX directory is not defined." ; \
-	   echo "Run 'make install' from top-level directory" ; \
+	   echo "Fatal error: PREFIX directory is not defined." && \
+	   echo "Run 'make install' from top-level directory" && \
 	   exit 1 ; \
 	fi
 	install -m0755 -d $(INSTALLDIR)
-	set -e ; \
-	   cd $(INSTALLBINDIR) ; \
+	set -e && \
+	   cd $(LOCALBINDIR) && \
 	   install -s -m0755 $(CPROGS) $(INSTALLDIR)
-	set -e ; \
-	   cd ../bin ; \
+	set -e && \
+	   cd ../bin && \
 	   install    -m0755 $(PPROGS) $(INSTALLDIR)
 
 #
@@ -53,10 +66,12 @@ install:
 # The *.dSYM is for Mac OS X.
 #
 clean:
-	\rm -f $(CPROGS)
+	\rm -f $(CPROGS) *.o
+	\rm -f *~
 	\rm -f *.exe
 	\rm -rf *.dSYM
 
 distclean: clean
+	\rm -f bin-stamp *~
 
-.PHONY: all install clean distclean
+.PHONY: all bin install clean distclean