mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
build: get rid of specialized makefile snippets
mutter won't have them, and we don't need them
This commit is contained in:
Ray Strode
Rui Matos
parent
ed0051d0b4
commit
7bd9bc2913
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
NULL =
|
||||
|
||||
SUBDIRS = build clutter tests doc po
|
||||
@ -27,10 +25,6 @@ DISTCLEANFILES =
|
||||
|
||||
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 rules for tests
|
||||
test-report full-report:
|
||||
$(MAKE) -C tests/conform $(@)
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
NULL =
|
||||
|
||||
EXTRA_DIST = \
|
||||
Makefile.am.silent \
|
||||
Makefile.am.marshal \
|
||||
Makefile.am.enums \
|
||||
Makefile.am.changelog \
|
||||
Makefile.am.gitignore \
|
||||
Makefile.am.release \
|
||||
introspection.m4 \
|
||||
gtk-doc.m4 \
|
||||
as-compiler-flag.m4 \
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
# Taken from Cairo - build/Makefile.am.changelog
|
||||
# Modified to fit the Clutter build environment
|
||||
|
||||
CURR_CHANGELOG_VERSION=$(CLUTTER_MAJOR_VERSION).$$(echo "($(CLUTTER_MINOR_VERSION)+1)/2*2" | bc)
|
||||
# examines $version
|
||||
PREV_CHANGELOG_VERSION=$$(if test "x$$(echo "($$version-0.1)*2/2"|bc)" = "x$$(echo "$$version*2/2"|bc)"; \
|
||||
then echo "$$version-$$(echo "$$version" | sed 's/[0-9]/0/g;s/[0-9]$$/2/')"; \
|
||||
else echo "$$version-1.0"; \
|
||||
fi | bc | sed 's/[.]0*/./;s/^0[.]\?$$/git-import/;s/[.]$$/.0/')
|
||||
|
||||
CHANGELOGS = ChangeLog \
|
||||
`version=$(CURR_CHANGELOG_VERSION); \
|
||||
version=$(PREV_CHANGELOG_VERSION); \
|
||||
while test "x$$version" != "xgit-import"; do \
|
||||
echo ChangeLog.pre-$$version; \
|
||||
version=$(PREV_CHANGELOG_VERSION); \
|
||||
done`
|
||||
|
||||
CLEANFILES += $(srcdir)/ChangeLog.cache-*
|
||||
|
||||
changelogs:
|
||||
@$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS)
|
||||
|
||||
dist-hook: changelogs
|
||||
changelogs="$(CHANGELOGS)"; \
|
||||
for changelog in $$changelogs; do \
|
||||
cp $(srcdir)/$$changelog $(distdir)/ 2>/dev/null || \
|
||||
cp $$changelog $(distdir)/; \
|
||||
done
|
||||
|
||||
$(srcdir)/ChangeLog:
|
||||
@if test -d "$(srcdir)/.git"; then \
|
||||
version=$(CURR_CHANGELOG_VERSION); \
|
||||
prev=$(PREV_CHANGELOG_VERSION).0; \
|
||||
nearest_tag=`git describe | sed 's/-.*//'`; \
|
||||
before=$(srcdir)/ChangeLog.cache-$$prev..$$nearest_tag; \
|
||||
after=$(srcdir)/ChangeLog.cache-$$nearest_tag..; \
|
||||
$(MAKE) $(AM_MAKEFLAGS) $$before $$after && \
|
||||
echo Creating $@ && \
|
||||
{ echo '# Generated by configure. Do not edit.'; echo; \
|
||||
cat $$after; echo; cat $$before; } > $@; \
|
||||
else \
|
||||
test -f $@ || \
|
||||
(echo A git checkout is required to generate $@ >&2 && \
|
||||
echo A git checkout is required to generate this file >> $@); \
|
||||
fi
|
||||
|
||||
DISTCLEANFILES += ChangeLog.cache-*
|
||||
|
||||
ChangeLog.cache-*..: .git
|
||||
|
||||
ChangeLog%: $(srcdir)/ChangeLog%
|
||||
|
||||
$(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
|
||||
@echo "Creating $@"
|
||||
@if test -d "$(srcdir)/.git"; then \
|
||||
(cd "$(srcdir)" && \
|
||||
version=$$(echo "$@" | sed 's/.*ChangeLog\([.].*-\)\?//'); \
|
||||
if echo "$@" | grep -q '^ChangeLog[.]cache'; then \
|
||||
spec=$$version; \
|
||||
else \
|
||||
to=$$version; \
|
||||
test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \
|
||||
from=$(PREV_CHANGELOG_VERSION); \
|
||||
test "x$$to" = x || to=$$to.0; \
|
||||
test "x$$from" = xgit-import || from=$$from.0; \
|
||||
spec=$$from..$$to; \
|
||||
fi; \
|
||||
$(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
|
||||
&& mv -f $@.tmp $@ \
|
||||
|| ($(RM) $@.tmp; \
|
||||
echo Failed to generate $@, your $@ may be outdated >&2); \
|
||||
else \
|
||||
echo A git checkout is required to generate $@ >&2; \
|
||||
fi
|
||||
|
||||
.PHONY: changelogs ChangeLog $(srcdir)/ChangeLog
|
||||
@ -1,27 +0,0 @@
|
||||
# this file should only be used in directories that generate test
|
||||
# or example binaries through noinst_PROGRAMS; it is *not* a full
|
||||
# generator of Git ignore files, and it's not meant to be used as
|
||||
# the top-level Git ignore file generator.
|
||||
|
||||
GIT_IGNORE_FILES = $(noinst_PROGRAMS) $(check_PROGRAMS) $(check_SCRIPTS) $(GIT_IGNORE_EXTRA)
|
||||
|
||||
.gitignore: Makefile.am
|
||||
$(QUIET_GEN)if test -d "$(top_srcdir)/.git"; then \
|
||||
( echo "*.o" ; \
|
||||
echo ".gitignore" ; \
|
||||
) > .gitignore ; \
|
||||
for p in $(GIT_IGNORE_FILES); do \
|
||||
echo "/$$p" >> .gitignore ; \
|
||||
done \
|
||||
fi
|
||||
|
||||
gitignore: .gitignore
|
||||
|
||||
gitignore-clean:
|
||||
$(QUIET_RM)rm -f .gitignore
|
||||
|
||||
.PHONY: gitignore gitignore-clean
|
||||
|
||||
all-am: gitignore
|
||||
|
||||
maintainer-clean: gitignore-clean
|
||||
@ -1,166 +0,0 @@
|
||||
# To make real stable releases or devel snapshots, use either:
|
||||
# make release-check
|
||||
# or make release-publish
|
||||
|
||||
TAR_OPTIONS = --owner=0 --group=0
|
||||
|
||||
#RELEASE_UPLOAD_HOST = clutter-project.org
|
||||
#RELEASE_UPLOAD_USER = clutter
|
||||
#RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_USER)@$(RELEASE_UPLOAD_HOST):~$(RELEASE_UPLOAD_USER)/upload-source
|
||||
|
||||
#RELEASE_URL_BASE = http://source.clutter-project.org/sources/clutter
|
||||
#RELEASE_URL = $(RELEASE_URL_BASE)/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)
|
||||
|
||||
RELEASE_ANNOUNCE_LIST = clutter-list@gnome.org
|
||||
RELEASE_ANNOUNCE_CC = gnome-announce-list@gnome.org
|
||||
|
||||
RELEASE_DOWNLOAD_URL = https://download.gnome.org/sources/clutter
|
||||
|
||||
RELEASE_DOC_URL = https://developer.gnome.org
|
||||
REFERENCE_DOC_URL = $(RELEASE_DOC_URL)/clutter
|
||||
COOKBOOK_DOC_URL = $(RELEASE_DOC_URL)/clutter-cookbook
|
||||
|
||||
BUGS_URL = https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
|
||||
|
||||
tar_file = $(distdir).tar.xz
|
||||
sha256_file = $(distdir).sha256sum
|
||||
|
||||
$(sha256_file): $(tar_file)
|
||||
$(AM_V_GEN)sha256sum $^ > $@
|
||||
|
||||
release-tag:
|
||||
@if test "x$(CLUTTER_RELEASE_STATUS)" = "xgit"; then \
|
||||
echo "*** Cannot tag a Git version; please, update the Clutter version" >&2; \
|
||||
else \
|
||||
if test -d "$(top_srcdir)/.git"; then \
|
||||
echo " TAG Tagging release $(CLUTTER_VERSION)..." ; \
|
||||
$(top_srcdir)/build/missing --run git tag \
|
||||
-s \
|
||||
-m "Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))" \
|
||||
$(CLUTTER_VERSION) ; \
|
||||
else \
|
||||
echo "*** A git checkout is required to tag a release" >&2; \
|
||||
fi \
|
||||
fi
|
||||
|
||||
release-check: release-verify-even-micro release-verify-sane-changelogs release-verify-news
|
||||
TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck
|
||||
|
||||
release-verify-news:
|
||||
@echo -n " CHK Checking that the NEWS file has been updated..."
|
||||
@if ! grep -q "$(CLUTTER_VERSION)" $(top_srcdir)/NEWS; then \
|
||||
(echo "Ouch." && \
|
||||
echo "*** The version in the NEWS file does not match $(CLUTTER_VERSION)." && \
|
||||
echo "*** This probably means you haven't updated the NEWS file." && \
|
||||
false); else :; fi
|
||||
@echo "Good."
|
||||
|
||||
release-verify-sane-changelogs: changelogs
|
||||
@echo -n " CHK Checking that the ChangeLog files are sane..."
|
||||
@if grep -q "is required to generate" $(CHANGELOGS); then \
|
||||
(echo "Ouch." && \
|
||||
echo "*** Some of the ChangeLogs are not generated correctly." && \
|
||||
echo "*** Remove ChangeLog* and make changelogs" && false); else :; fi
|
||||
@echo "Good."
|
||||
|
||||
release-verify-even-micro:
|
||||
@echo -n " CHK Checking that $(VERSION) has an even micro component..."
|
||||
@test "$(CLUTTER_MICRO_VERSION)" = "`echo $(CLUTTER_MICRO_VERSION)/2*2 | bc`" || \
|
||||
(echo "Ouch." && \
|
||||
echo "*** The version micro component '$(CLUTTER_MICRO_VERSION)' is not an even number." && \
|
||||
echo "*** The version in configure.ac must be incremented before a new release." && \
|
||||
false)
|
||||
@echo "Good."
|
||||
|
||||
release-upload: $(sha256_file)
|
||||
@echo -n " SCP Uploading to master.gnome.org... "
|
||||
@scp $(tar_file) master.gnome.org:
|
||||
@echo "Done."
|
||||
@echo -n " EXEC Running ftpadmin install... "
|
||||
@ssh master.gnome.org ftpadmin install $(tar_file)
|
||||
@mv -f $(sha256_file) $(top_builddir)/build/$(sha256_file)
|
||||
@echo "Done."
|
||||
|
||||
release-message:
|
||||
@echo " Release URL: $(RELEASE_URL)/$(tar_file)"
|
||||
@echo "Release checksum: $(RELEASE_URL)/$(sha256_file)"
|
||||
@echo "Send an email to: $(RELEASE_ANNOUNCE_LIST)"
|
||||
@echo " Cc: $(RELEASE_ANNOUNCE_CC)"
|
||||
@echo " Subject: ANNOUNCE: Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))"
|
||||
@echo " Contents:"
|
||||
@echo "--- CUT HERE ---"
|
||||
@echo "Good news, everyone!"
|
||||
@echo ""
|
||||
@echo "A new Clutter $(CLUTTER_RELEASE_STATUS) is now available at:"
|
||||
@echo ""
|
||||
@echo " $(RELEASE_DOWNLOAD_URL)/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)/"
|
||||
@echo ""
|
||||
@echo "SHA256 Checksum:"
|
||||
@echo ""
|
||||
@cat $(top_builddir)/build/$(sha256_file)
|
||||
@echo ""
|
||||
@echo "Additionally, a git clone of the source tree:"
|
||||
@echo " git clone git://git.gnome.org/clutter"
|
||||
@echo ""
|
||||
@echo "will include a signed $(CLUTTER_VERSION) tag which points to a commit named:"
|
||||
@echo " `git cat-file tag $(CLUTTER_VERSION) | $(GREP) ^object | $(SED) -e 's,object ,,'`"
|
||||
@echo ""
|
||||
@echo "which can be verified with:"
|
||||
@echo " git verify-tag $(CLUTTER_VERSION)"
|
||||
@echo ""
|
||||
@echo "and can be checked out with a command such as:"
|
||||
@echo " git checkout -b build $(CLUTTER_VERSION)"
|
||||
@echo ""
|
||||
@echo "Clutter is a library for creating compelling, dynamic, and portable graphical"
|
||||
@echo "user interfaces. Clutter is released under the terms of the GNU Lesser"
|
||||
@echo "General Public License, version 2.1 or (at your option) later."
|
||||
@echo ""
|
||||
@echo "Clutter depends on:"
|
||||
@echo " GLib ≥ @GLIB_REQ_VERSION@"
|
||||
@echo " JSON-GLib ≥ @JSON_GLIB_REQ_VERSION@"
|
||||
@echo " Cogl ≥ @COGL_REQ_VERSION@"
|
||||
@echo " Cairo ≥ @CAIRO_REQ_VERSION@"
|
||||
@echo " Pango ≥ @PANGO_REQ_VERSION@"
|
||||
@echo " Atk ≥ @ATK_REQ_VERSION@"
|
||||
@echo ""
|
||||
@echo "Clutter also has platform-specific dependencies; for more information, see"
|
||||
@echo "the README file included in the release."
|
||||
@echo ""
|
||||
@echo "Documentation:"
|
||||
@if test "x$(CLUTTER_RELEASE_STATUS)" = "xsnapshot"; then \
|
||||
echo " Clutter: $(REFERENCE_DOC_URL)/unstable/"; \
|
||||
else \
|
||||
echo " Clutter: $(REFERENCE_DOC_URL)/stable/"; \
|
||||
fi
|
||||
@echo " Cookbook: $(COOKBOOK_DOC_URL)/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)/"
|
||||
@echo ""
|
||||
@echo "Release Notes:"
|
||||
@if test "x$(CLUTTER_RELEASE_STATUS)" = "xsnapshot"; then \
|
||||
echo " - This is an unstable snapshot of Clutter; there are no compatibility"; \
|
||||
echo " guarantees for API added during a development cycle." ; \
|
||||
fi
|
||||
@echo " - This version is API and ABI compatible with the previous stable"
|
||||
@echo " release of Clutter."
|
||||
@echo " - Installing the contents of this release will overwrite the files"
|
||||
@echo " from the installation of the previous release of Clutter."
|
||||
@echo " - Bugs should be reported on the Clutter Bugzilla product, at:"
|
||||
@echo " ${BUGS_URL}"
|
||||
@echo ""
|
||||
@$(SED) -n '1bend;/^Clutter /q;:end;2,$$p' $(top_srcdir)/NEWS | $(GREP) -v '^======'
|
||||
@echo ""
|
||||
@echo "Have fun with Clutter!"
|
||||
@echo "--- CUT HERE ---"
|
||||
|
||||
release-publish: release-check
|
||||
$(MAKE) $(AM_MAKEFLAGS) release-tag
|
||||
$(MAKE) $(AM_MAKEFLAGS) release-upload
|
||||
$(MAKE) $(AM_MAKEFLAGS) release-message
|
||||
|
||||
.PHONY: \
|
||||
release-check \
|
||||
release-message \
|
||||
release-publish \
|
||||
release-tag \
|
||||
release-upload \
|
||||
release-verify-even-micro \
|
||||
release-verify-sane-changelogs
|
||||
@ -1,19 +0,0 @@
|
||||
# custom rules for quiet builds
|
||||
|
||||
QUIET_GEN = $(AM_V_GEN)
|
||||
|
||||
QUIET_LN = $(QUIET_LN_$(V))
|
||||
QUIET_LN_ = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
|
||||
QUIET_LN_0 = @echo ' LN '$@;
|
||||
|
||||
QUIET_RM = $(QUIET_RM_$(V))
|
||||
QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
|
||||
QUIET_RM_0 = @echo ' RM '$@;
|
||||
|
||||
QUIET_SCAN = $(QUIET_SCAN_$(V))
|
||||
QUIET_SCAN_ = $(QUIET_SCAN_$(AM_DEFAULT_VERBOSITY))
|
||||
QUIET_SCAN_0 = @echo ' GISCAN '$@;
|
||||
|
||||
QUIET_COMP = $(QUIET_COMP_$(V))
|
||||
QUIET_COMP_ = $(QUIET_COMP_$(AM_DEFAULT_VERBOSITY))
|
||||
QUIET_COMP_0 = @echo ' GICOMP '$@;
|
||||
@ -1,7 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
# preamble
|
||||
NULL =
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
SUBDIRS = examples
|
||||
|
||||
NULL =
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
NULL =
|
||||
|
||||
EXTRA_DIST =
|
||||
@ -140,5 +138,3 @@ EXTRA_DIST += $(ui_data) $(img_data)
|
||||
|
||||
examples_DATA += $(ui_data) $(img_data) $(srcdir)/*.c $(srcdir)/*.h
|
||||
noinst_PROGRAMS += $(all_examples)
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
all_examples = \
|
||||
actor-model \
|
||||
basic-actor \
|
||||
@ -36,5 +34,3 @@ AM_CPPFLAGS = \
|
||||
noinst_PROGRAMS = $(all_examples)
|
||||
|
||||
EXTRA_DIST = redhand.png
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
common_ldadd = \
|
||||
$(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
|
||||
|
||||
@ -34,5 +32,3 @@ cally_atkeditabletext_example_SOURCES = $(common_sources) cally-atkeditabletext-
|
||||
cally_clone_example_SOURCES = $(common_sources) cally-clone-example.c
|
||||
|
||||
DISTCLEANFILES =
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
UNIT_TESTS = \
|
||||
test-texture-slicing.c \
|
||||
test-texture-async.c \
|
||||
@ -73,8 +71,6 @@ GIT_IGNORE_EXTRA = \
|
||||
test-unit-names.h \
|
||||
$(UNIT_TESTS:.c=$(SHEXT))
|
||||
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
stamp-test-interactive: Makefile
|
||||
@wrapper=$(abs_builddir)/wrapper.sh ; \
|
||||
chmod +x $$wrapper && \
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
|
||||
|
||||
check_PROGRAMS = \
|
||||
@ -29,5 +27,3 @@ test_picking_SOURCES = test-picking.c
|
||||
test_text_perf_SOURCES = test-text-perf.c
|
||||
test_random_text_SOURCES = test-random-text.c
|
||||
test_cogl_perf_SOURCES = test-cogl-perf.c
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
||||
|
||||
check_PROGRAMS = \
|
||||
test-picking \
|
||||
test-text-perf \
|
||||
@ -40,5 +38,3 @@ test_state_interactive_SOURCES = test-state-interactive.c
|
||||
test_state_mini_SOURCES = test-state-mini.c
|
||||
|
||||
EXTRA_DIST = Makefile-retrospect Makefile-tests create-report.rb test-common.h
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
||||
Loading…
Reference in New Issue
Block a user