keysyms-update: Add deprecation guards to the deprecated header

[profile/ivi/clutter.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8783208..e8cd0ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,93 +1,51 @@
+include $(top_srcdir)/build/autotools/Makefile.am.silent
+
 NULL =
 
-SUBDIRS = build clutter tests po
+SUBDIRS = clutter doc po build
 
-if BUILD_GTK_DOC
-SUBDIRS += doc
+if BUILD_TESTS
+SUBDIRS += tests
 endif
 
-DIST_SUBDIRS = build clutter tests doc po
-
-ACLOCAL_AMFLAGS = -I build/autotools
-
-pcfiles = \
-       clutter-$(CLUTTER_API_VERSION).pc \
-       clutter-$(CLUTTER_FLAVOUR)-$(CLUTTER_API_VERSION).pc \
-       $(NULL)
-
-# clutter-<major>.<minor>.pc - for generic dependencies
-clutter-$(CLUTTER_API_VERSION).pc: clutter.pc
-       $(QUIET_GEN)cp $< $@
-
-# clutter-<flavour>-<major>.<minor>.pc - for backend-specific dependencies
-clutter-$(CLUTTER_FLAVOUR)-$(CLUTTER_API_VERSION).pc: clutter.pc
-       $(QUIET_GEN)cp $< $@
-
-.PHONY: test-report full-report
-test-report full-report:
-       $(MAKE) -C tests/conform $(@)
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
 
-pkgconfig_DATA = $(pcfiles)
-pkgconfigdir   = $(libdir)/pkgconfig
+DIST_SUBDIRS = clutter tests examples doc po build
 
-DEFAULT_FLAVOUR = @CLUTTER_FLAVOUR@
+# XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
+# that jhbuild sets while still retaining build/autotools as the authoritative
+# source for m4 macros
+ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 
-EXTRA_DIST =                   \
-       ChangeLog.SVN           \
-       clutter.pc.in           \
-       HACKING                 \
-       HACKING.backends        \
-       CODING_STYLE
+EXTRA_DIST = \
+       ChangeLog.pre-git-import        \
+       README.in                       \
+       README                          \
+       config.h.win32          \
+       config.h.win32.in       \
+       $(NULL)
 
 CLEANFILES = $(pcfiles)
 
 DISTCLEANFILES =
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = \
-       aclocal.m4 \
-       compile \
-       config.guess \
-       config.h.in \
-       config.sub \
-        configure \
-       depcomp \
-       gtk-doc.make \
-       install-sh \
-       ltmain.sh \
-       Makefile.in \
-       missing \
-       $(NULL)
-
-MAINTAINERCLEANFILES += $(srcdir)/ChangeLog
-
-PREV_RELEASE=$(CLUTTER_MAJOR_VERSION).$$(echo "$(CLUTTER_MINOR_VERSION)-1" | bc)
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-docs
 
-CHANGELOGS = ChangeLog
+# .release requires .changelog rules
+include $(top_srcdir)/build/autotools/Makefile.am.changelog
+include $(top_srcdir)/build/autotools/Makefile.am.release
 
-changelogs:
-       @$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
+# proxy rule for gcov
+gcov:
+       @( cd clutter && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $$?
 
-dist-hook: changelogs
-       changelogs="$(CHANGELOGS)"; \
-       for changelog in $$changelogs; \
-       do \
-               cp -f $(srcdir)/$$changelog $(distdir)/ 2>/dev/null || \
-               cp -f $$changelog $(distdir)/; \
-       done
+# proxy rules for tests
+test-report full-report:
+       $(MAKE) -C tests/conform $(@)
 
-$(srcdir)/ChangeLog:
-       @if test -d "$(top_srcdir)/.git"; \
-       then \
-               to=""; \
-               from="$(PREV_RELEASE)"; \
-               echo Creating $@ && \
-               ( echo '# Generated by configure.  Do no edit.'; echo; \
-               $(top_srcdir)/missing --run perl $(top_srcdir)/build/gen-changelog.pl $$from.0..$$to ) > $@ ; \
-       else \
-               echo A git checkout is required to generate $@; \
-       fi
+perf-report:
+       $(MAKE) -C tests/performance $(@)
 
-.PHONY: changelogs ChangeLog $(srcdir)/ChangeLog
+.PHONY: gcov test-report full-report perf-report