Added AM_PROG_AR

[ccunit/ccunit.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 235f3c7..94e993b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,42 +26,53 @@ DIST_SUBDIRS= $(SUBDIRS) doc
 AM_CFLAGS=-I$(top_srcdir)/src -Wall -Werror
 AM_LDFLAGS=-L$(top_srcdir)/src/ccunit
 CLEANFILES=*~ .*~ ./\#*\# *.log configure.scan *.tar.gz *.tar.bz2 *.zip \
-       config/*~ config/.*~
+       config/*~ config/.*~ _configs.sed
 
-EXTRA_DIST = BUGS ChangeLog ChangeLog.0 \
+EXTRA_DIST = BUGS ChangeLog ChangeLog.1 ChangeLog.0 \
        config/arg_with_doxygen.m4 \
+       config/arg_enable_coverage.m4 \
        config/ac_create_prefix_config_h.m4 \
-       config/arg_enable_coverage.m4
+       config/ax_prefix_config_h.m4 \
+       configure bootstrap
 
 docs:
-       cd doc; $(MAKE) docs
+       cd doc; $(MAKE)
 
-distdocdir=$(PACKAGE)-$(VERSION)-doc
+distdocdir=@DISTDOCDIR@
+distdocjadir=@DISTDOCJADIR@
 
 dist-docs: distdocdir
        cd doc; $(MAKE) dist-docs
-       $(AMTAR) chof - $(distdocdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdocdir).tar.gz
-       $(AMTAR) chof - $(distdocdir) | bzip2 -9 -c >$(distdocdir).tar.bz2
-       -rm -f $(distdocdir).zip
-       zip -rq $(distdocdir).zip $(distdocdir)
-       { test ! -d $(distdocdir) \
-         || { find $(distdocdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-               && rm -fr $(distdocdir); }; }
+       for d in $(distdocdir) $(distdocjadir); do \
+       { $(AMTAR) chof - $$d | GZIP=$(GZIP_ENV) gzip -c >$$d.tar.gz; \
+         $(AMTAR) chof - $$d | bzip2 -9 -c >$$d.tar.bz2; \
+         rm -f $$d.zip; \
+         zip -rq $$d.zip $$d; \
+         { test ! -d $$d \
+           || { find $$d -type d ! -perm -200 -exec chmod u+w {} ';' \
+               && rm -fr $$d; }; }; \
+       };\
+       done
 
 distdocdir: docs
-       { test ! -d $(distdocdir) \
-         || { find $(distdocdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-               && rm -fr $(distdocdir); }; }
-       mkdir $(distdocdir)
+       for d in $(distdocdir) $(distdocjadir); do \
+       { test ! -d $$d \
+         || { find $$d -type d ! -perm -200 -exec chmod u+w {} ';' \
+               && rm -fr $$d; }; \
+       }; \
+       done
        $(mkinstalldirs) $(distdocdir)/html
+if ENABLE_JADOC
+       $(mkinstalldirs) $(distdocjadir)/html/ja
+endif
 
 uploadhp: docs
        set -x
        tar czf /tmp/html.tar.gz -C doc/html .
        tar czf /tmp/jahtml.tar.gz -C doc/ja/html .
-       scp /tmp/html.tar.gz tsutsumi@shell.sourceforge.jp:html.tar.gz
-       scp /tmp/jahtml.tar.gz tsutsumi@shell.sourceforge.jp:jahtml.tar.gz
-       ssh tsutsumi@shell.sourceforge.jp \
+       scp /tmp/html.tar.gz tsntsumi@shell.sourceforge.jp:html.tar.gz
+       scp /tmp/jahtml.tar.gz tsntsumi@shell.sourceforge.jp:jahtml.tar.gz
+       ssh tsntsumi@shell.sourceforge.jp \
         'rm -fr /home/groups/c/cc/ccunit/htdocs/*;\
          tar xzf html.tar.gz -C /home/groups/c/cc/ccunit/htdocs;\
          mkdir -p /home/groups/c/cc/ccunit/htdocs/ja;\