Move GT/ into TrueType/.

diff --git a/Makefile.in b/Makefile.in
index b3e6d79..1ed94ee 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,11 +18,10 @@ SCRIPTS_DIR = $(datadir)/scripts
 OPTS           = @ac_configure_args@
 
 
-all:   build-intlfonts build-bdf build-truetype build-gt
+all:   build-intlfonts build-bdf build-truetype
 
 install:       all \
-       install-intlfonts install-bdf install-truetype install-gt \
-       install-scripts
+       install-intlfonts install-bdf install-truetype install-scripts
 
 
 build-intlfonts:       intlfonts-1.2.1/config.log
@@ -53,13 +52,6 @@ install-truetype:
        cd TrueType && make install
 
 
-build-gt:
-       cd GT && make all
-
-install-gt:
-       cd GT && make install
-
-
 install-scripts:
        -$(MKDIR) $(SCRIPTS_DIR)
        install -c chise-setup-xfonts $(SCRIPTS_DIR)
@@ -68,7 +60,6 @@ install-scripts:
 distclean:
        cd BDF && make distclean
        cd TrueType && make distclean
-       cd GT && make distclean
        -$(RM) Makefile config.status config.log chise-setup-xfonts
        -$(RM) -r autom4te.cache/ intlfonts-1.2.1/
 
@@ -76,7 +67,6 @@ distclean:
 distclean-all:
        cd BDF && make distclean-all
        cd TrueType && make distclean-all
-       cd GT && make distclean-all
        -$(RM) intlfonts-1.2.1.tar.gz
        -$(RM) Makefile config.status config.log chise-setup-xfonts
        -$(RM) -r autom4te.cache/ intlfonts-1.2.1/

diff --git a/TrueType/Makefile.in b/TrueType/Makefile.in
index 8d5862e..dab88e3 100644 (file)
--- a/TrueType/Makefile.in
+++ b/TrueType/Makefile.in
@@ -11,9 +11,9 @@ LIBDIR                = @libdir@
 OPTS           = @ac_configure_args@
 
 
-all:   build-hanazono build-zinbun
+all:   build-hanazono build-zinbun build-gt
 
-install:       install-hanazono install-zinbun
+install:       install-hanazono install-zinbun install-gt
 
 
 build-hanazono:
@@ -37,14 +37,23 @@ install-zinbun:
        cd Zinbun && make install
 
 
+build-gt:
+       cd GT && make all
+
+install-gt:
+       cd GT && make install
+
+
 distclean:
        cd Hanazono && make distclean
        cd Arphic && make distclean
        cd Zinbun && make distclean
+       cd GT && make distclean
        -$(RM) Makefile
 
 distclean-all:
        cd Hanazono && make distclean-all
        cd Arphic && make distclean-all
        cd Zinbun && make distclean-all
+       cd GT && make distclean-all
        -$(RM) Makefile