Merge branch 'jhcloos'

[fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e316d8a8556fb72b637859c161a7ecf3f6bc16b7..1ebb86978c031dd935ce677a9726e4588a2aa35b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 
 DOCSRC=@DOCSRC@
 SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-       fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+       fc-cache fc-cat fc-list fc-match conf.avail conf.d $(DOCSRC) test
         
 EXTRA_DIST = \
         fontconfig.pc.in \
@@ -32,6 +32,21 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
        fontconfig-zip.in
+DISTCLEANFILES = config.cache
+MAINTAINERCLEANFILES = \
+       $(srcdir)/aclocal.m4 \
+       $(srcdir)/autoscan.log \
+       $(srcdir)/compile \
+       $(srcdir)/config.guess \
+       $(srcdir)/config.h.in \
+       $(srcdir)/config.sub \
+       $(srcdir)/configure.scan \
+       $(srcdir)/depcomp \
+       $(srcdir)/install-sh \
+       $(srcdir)/ltmain.sh \
+       $(srcdir)/missing \
+       $(srcdir)/mkinstalldirs \
+       `find "$(srcdir)" -type f -name Makefile.in -print`
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
@@ -45,8 +60,32 @@ else
   RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
 endif
 
+# Creating ChangeLog from git log:
+
+MAINTAINERCLEANFILES += ChangeLog
+
+EXTRA_DIST += ChangeLog
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+       @if test -d "$(srcdir)/.git"; then \
+         (cd "$(srcdir)" && \
+         ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+         && mv -f $@.tmp $@ \
+         || ($(RM) $@.tmp; \
+             echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+             (test -f $@ || echo git-log is required to generate this file >> $@)); \
+       else \
+         test -f $@ || \
+         (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+         echo A git checkout and git-log is required to generate this file >> $@); \
+       fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
+
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(configdir)
+       $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
        if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
          echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
          mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
@@ -58,7 +97,7 @@ install-data-local:
          echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
          $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
        fi; fi
-       @(if $(RUN_FC_CACHE_TEST); then \
+       (if $(RUN_FC_CACHE_TEST); then \
            echo " fc-cache/fc-cache -s -f -v"; \
            fc-cache/fc-cache -s -f -v; \
        else \