upgrade to 2.14.2

[platform/upstream/fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 22f2354..6d4cd32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,24 +21,42 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
-       fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
-       fc-validate conf.d test
+SUBDIRS=fontconfig fc-case fc-lang src \
+       fc-cache fc-cat fc-conflist fc-list fc-match \
+       fc-pattern fc-query fc-scan fc-validate conf.d \
+       its po po-conf test
 if ENABLE_DOCS
 SUBDIRS += doc
 endif
 
-AUTOMAKE_OPTIONS = dist-bzip2
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = \
-        fontconfig.pc.in \
-        fonts.conf.in \
+MESON_FILES = \
+       conf.d/link_confs.py \
+       conf.d/write-35-lang-normalize-conf.py \
+       doc/edit-sgml.py \
+       doc/extract-man-list.py \
+       doc/run-quiet.py \
+       fc-case/fc-case.py \
+       fc-lang/fc-lang.py \
+       meson.build \
+       meson_options.txt \
+       src/cutout.py \
+       src/fcstdint.h.in \
+       src/fcwindows.h \
+       src/fontconfig.def.in \
+       src/makealias.py \
+       $(wildcard $(srcdir)/*/meson.build) \
+       $(wildcard $(srcdir)/meson-cc-tests/*) \
+       $(wildcard $(srcdir)/subprojects/*.wrap)
+
+EXTRA_DIST = config.rpath  \
+       fontconfig.pc.in \
+       fonts.conf.in \
        fonts.dtd \
-        fontconfig.spec.in \
-        fontconfig.spec \
        fontconfig-zip.in \
-       config-fixups.h
+       config-fixups.h \
+       $(MESON_FILES)
 CLEANFILES = fonts.conf
 DISTCLEANFILES = config.cache doltcompile
 MAINTAINERCLEANFILES = \
@@ -54,6 +72,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/ltmain.sh \
        $(srcdir)/missing \
        $(srcdir)/mkinstalldirs \
+       $(srcdir)/test-driver \
        `find "$(srcdir)" -type f -name Makefile.in -print`
 
 pkgconfig_DATA = fontconfig.pc
@@ -64,7 +83,7 @@ configdir = $(CONFIGDIR)
 xmldir = $(XMLDIR)
 xml_DATA = fonts.dtd
 
-if CROSS_COMPILING
+if !ENABLE_CACHE_BUILD
   RUN_FC_CACHE_TEST=false
 else
   RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
@@ -90,12 +109,14 @@ $(srcdir)/ChangeLog:
 
 .PHONY: ChangeLog
 
+FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
+
 fonts.conf: fonts.conf.in Makefile
        sed \
                -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
-               -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
+               -e 's,@FC_DEFAULT_FONTS\@,      $(FC_DEFAULT_FONTS),g' \
                -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
-               -e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \
+               -e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \
                -e 's,@PACKAGE\@,$(PACKAGE),g' \
                -e 's,@VERSION\@,$(VERSION),g' \
                $(srcdir)/$@.in > $@.tmp && \
@@ -152,4 +173,14 @@ debuild-dirs: distdir
 
 DISTCHECK_CONFIGURE_FLAGS =
 
+check-versions:
+       @$(GREP) -e "^[[:space:]]*version[[:space:]]*:[[:space:]]*'$(VERSION)'," $(srcdir)/meson.build >/dev/null || { \
+         echo "======================================================================================"; \
+         echo "Meson version does not seem to match autotools version $(VERSION), update meson.build!"; \
+         echo "======================================================================================"; \
+         exit 1; \
+       }
+
+all-local: check-versions
+
 -include $(top_srcdir)/git.mk