keysyms-update: Add deprecation guards to the deprecated header

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

diff --git a/Makefile.am b/Makefile.am
index e501c12..e8cd0ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,52 +2,50 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = build clutter tests doc po
+SUBDIRS = clutter doc po build
 
-ACLOCAL_AMFLAGS = -I build/autotools
+if BUILD_TESTS
+SUBDIRS += tests
+endif
 
-pcfiles = \
-       clutter-$(CLUTTER_API_VERSION).pc \
-       clutter-$(CLUTTER_SONAME_INFIX)-$(CLUTTER_API_VERSION).pc \
-       $(NULL)
-
-# clutter-<major>.<minor>.pc - for generic dependencies
-clutter-$(CLUTTER_API_VERSION).pc: clutter.pc
-       $(QUIET_GEN)cp $< $@
-
-# clutter-<winsys>-<major>.<minor>.pc - for backend-specific dependencies
-clutter-$(CLUTTER_SONAME_INFIX)-$(CLUTTER_API_VERSION).pc: clutter.pc
-       $(QUIET_GEN)cp $< $@
+if BUILD_EXAMPLES
+SUBDIRS += examples
+endif
 
-.PHONY: test-report full-report
-test-report full-report:
-       $(MAKE) -C tests/conform $(@)
+DIST_SUBDIRS = clutter tests examples doc po build
 
-pkgconfig_DATA = $(pcfiles)
-pkgconfigdir   = $(libdir)/pkgconfig
+# 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 =                           \
+EXTRA_DIST = \
        ChangeLog.pre-git-import        \
-       clutter.pc.in                   \
+       README.in                       \
+       README                          \
+       config.h.win32          \
+       config.h.win32.in       \
        $(NULL)
 
 CLEANFILES = $(pcfiles)
 
-DISTCLEANFILES = doltcompile doltlibtool
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
+DISTCLEANFILES =
 
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES =         \
-       aclocal.m4      \
-       config.guess    \
-       config.h.in     \
-        configure      \
-       gtk-doc.make    \
-       Makefile.in     \
-       $(NULL)
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-docs
 
+# .release requires .changelog rules
 include $(top_srcdir)/build/autotools/Makefile.am.changelog
+include $(top_srcdir)/build/autotools/Makefile.am.release
 
+# proxy rule for gcov
 gcov:
        @( cd clutter && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $$?
+
+# proxy rules for tests
+test-report full-report:
+       $(MAKE) -C tests/conform $(@)
+
+perf-report:
+       $(MAKE) -C tests/performance $(@)
+
+.PHONY: gcov test-report full-report perf-report