Commit b19fca96 authored by Richard Hughes's avatar Richard Hughes

Use git.mk and remove the manual .gitignore files

parent 75894ebb
Makefile
Makefile.in
aclocal.m4
config.cache
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.scan
compile
depcomp
intl
libtool
ltconfig
ltmain.sh
missing
mkinstalldirs
install-sh
stamp-h
stamp-h1
stamp-h.in
version.h
intl
macros
INSTALL
ChangeLog
*.tar.*
xml-i18n-extract.in
xml-i18n-extract
xml-i18n-merge.in
xml-i18n-merge
xml-i18n-update.in
xml-i18n-update
intltool-extract.in
intltool-extract
intltool-merge.in
intltool-merge
intltool-update.in
intltool-update
*.pc
xmldocs.make
omf.make
gtk-doc.make
*~
*.swp
tags
NEWS.new
*.txt
.anjuta
*.cache
*.anjuta
libupshared*
......@@ -25,10 +25,26 @@ $(srcdir)/ChangeLog:
echo A git checkout and git-log is required to generate this file >> $@); \
fi
EXTRA_DIST = \
HACKING \
EXTRA_DIST = \
HACKING \
ChangeLog
MAINTAINERCLEANFILES = \
$(srcdir)ABOUT-NLS \
$(srcdir)aclocal.m4 \
$(srcdir)build-aux \
$(srcdir)ChangeLog \
$(srcdir)config.h.in \
$(srcdir)gtk-doc.make \
$(srcdir)po/Makefile.in.in~ \
$(srcdir)po/Makevars.template \
$(srcdir)po/Rules-quot \
$(srcdir)po/e*.header \
$(srcdir)po/*.sin \
$(srcdir)po/*.sed \
$(srcdir)*.tar.xz \
$(srcdir)INSTALL
snapshot:
$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`
......@@ -40,3 +56,5 @@ DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --enable-gtk-doc
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
*.args
*.hierarchy
*.interfaces
*.prerequisites
*.signals
*.types
*.stamp
html
*.7
*.8
*.1
tmpl
version.xml
xml
.libs
......@@ -74,9 +74,17 @@ FIXXREF_OPTIONS=
MAINTAINERCLEANFILES = \
*~ \
Makefile.in \
upower.types \
upower-*.txt \
$(NULL)
UPower.types \
UPower-*.txt
DISTCLEANFILES = \
org.freedesktop.UPower.Device.ref.xml \
org.freedesktop.UPower.KbdBacklight.ref.xml \
org.freedesktop.UPower.QoS.ref.xml \
org.freedesktop.UPower.ref.xml \
upowerd.xml \
upower.xml \
UPower.xml
if ENABLE_GTK_DOC
include $(top_srcdir)/gtk-doc.make
......@@ -87,3 +95,4 @@ endif
# Version information for marking the documentation
EXTRA_DIST += version.xml.in
-include $(top_srcdir)/git.mk
......@@ -23,5 +23,9 @@ org.freedesktop.UPower.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.UPowe
EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
MAINTAINERCLEANFILES = *.ref.xml
clean-local :
rm -f *~ *.ref.xml
-include $(top_srcdir)/git.mk
......@@ -8,6 +8,8 @@ man_MANS = \
%.1 %.7 %.8 : %.xml
$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
MAINTAINERCLEANFILES = $(man_MANS)
endif # MAN_PAGES_ENABLED
EXTRA_DIST= \
......@@ -17,3 +19,5 @@ EXTRA_DIST= \
clean-local:
rm -f *~ *.[178]
-include $(top_srcdir)/git.mk
......@@ -4,3 +4,4 @@ config_DATA = UPower.conf
EXTRA_DIST = \
$(config_DATA)
-include $(top_srcdir)/git.mk
# git.mk
#
# Copyright 2009, Red Hat, Inc.
# Written by Behdad Esfahbod
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved.
#
# The canonical source for this file is pango/git.mk, or whereever the
# header of pango/git.mk suggests in the future.
#
# To use in your project, import this file in your git repo's toplevel,
# then do "make -f git.mk". This modifies all Makefile.am files in
# your project to include git.mk.
#
# This enables automatic .gitignore generation. If you need to ignore
# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
# But think twice before doing that. If a file has to be in .gitignore,
# chances are very high that it's a generated file and should be in one
# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
#
# The only case that you need to manually add a file to GITIGNOREFILES is
# when remove files in one of mostlyclean-local, clean-local, distclean-local,
# or maintainer-clean-local.
#
# Note that for files like editor backup, etc, there are better places to
# ignore them. See "man gitignore".
#
# If "make maintainer-clean" removes the files but they are not recognized
# by this script (that is, if "git status" shows untracked files still), send
# me the output of "git status" as well as your Makefile.am and Makefile for
# the directories involved.
#
# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
# pango/Makefile.am.
#
# Don't EXTRA_DIST this file. It is supposed to only live in git clones,
# not tarballs. It serves no useful purpose in tarballs and clutters the
# build dir.
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
# gnome-doc-utils, mallard, intltool, gsettings.
#
#
# KNOWN ISSUES:
#
# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
# submodule doesn't find us. If you have configure.{in,ac} files in
# subdirs, add a proxy git.mk file in those dirs that simply does:
# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste.
# And add those files to git. See vte/gnome-pty-helper/git.mk for
# example.
#
# ChangeLog
#
# - 2010-12-06 Add support for Mallard docs
# - 2010-12-06 Start this change log
git-all: git-mk-install
git-mk-install:
@echo Installing git makefile
@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
if grep 'include .*/git.mk' $$x >/dev/null; then \
echo $$x already includes git.mk; \
else \
failed=; \
echo "Updating $$x"; \
{ cat $$x; \
echo ''; \
echo '-include $$(top_srcdir)/git.mk'; \
} > $$x.tmp || failed=1; \
if test x$$failed = x; then \
mv $$x.tmp $$x || failed=1; \
fi; \
if test x$$failed = x; then : else \
echo Failed updating $$x; >&2 \
any_failed=1; \
fi; \
fi; done; test -z "$$any_failed"
.PHONY: git-all git-mk-install
### .gitignore generation
$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(AM_V_GEN) \
{ \
if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
for x in \
$(DOC_MODULE)-decl-list.txt \
$(DOC_MODULE)-decl.txt \
tmpl/$(DOC_MODULE)-unused.sgml \
"tmpl/*.bak" \
xml html \
; do echo /$$x; done; \
fi; \
if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for x in \
$(_DOC_C_DOCS) \
$(_DOC_LC_DOCS) \
$(_DOC_OMF_ALL) \
$(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) \
$(_DOC_MOFILES) \
$(_DOC_POFILES) \
$(DOC_H_FILE) \
"*/.xml2po.mo" \
"*/*.omf.out" \
; do echo /$$x; done; \
fi; \
if test "x$(gsettings_SCHEMAS)" = x; then :; else \
for x in \
$(gsettings_SCHEMAS:.xml=.valid) \
$(gsettings__enum_file) \
; do echo /$$x; done; \
fi; \
if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \
po/Makefile.in.in \
po/Makefile.in \
po/Makefile \
po/POTFILES \
po/stamp-it \
po/.intltool-merge-cache \
"po/*.gmo" \
"po/*.mo" \
po/$(GETTEXT_PACKAGE).pot \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
; do echo /$$x; done; \
fi; \
if test -f $(srcdir)/configure; then \
for x in \
autom4te.cache \
configure \
config.h \
stamp-h1 \
libtool \
config.lt \
; do echo /$$x; done; \
fi; \
for x in \
.gitignore \
$(GITIGNOREFILES) \
$(CLEANFILES) \
$(PROGRAMS) \
$(check_PROGRAMS) \
$(EXTRA_PROGRAMS) \
$(LTLIBRARIES) \
so_locations \
.libs _libs \
$(MOSTLYCLEANFILES) \
"*.$(OBJEXT)" \
"*.lo" \
$(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \
TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
"*.tab.c" \
$(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \
$(DEPDIR) \
Makefile \
Makefile.in \
"*.orig" \
"*.rej" \
"*.bak" \
"*~" \
".*.sw[nop]" \
".dirstamp" \
; do echo /$$x; done; \
} | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
LC_ALL=C sort | uniq > $@.tmp && \
mv $@.tmp $@;
all: $(srcdir)/.gitignore gitignore-recurse-maybe
gitignore-recurse-maybe:
@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
fi;
gitignore-recurse:
@for subdir in $(DIST_SUBDIRS); do \
case " $(SUBDIRS) " in \
*" $$subdir "*) :;; \
*) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
esac; \
done
gitignore: $(srcdir)/.gitignore gitignore-recurse
maintainer-clean: gitignore-clean
gitignore-clean:
-rm -f $(srcdir)/.gitignore
.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
.deps
.libs
*.o
*.la
*.lo
*-marshal.c
*-marshal.h
*.gcov
*.gcda
*.gcno
up-version.h
*.gir
*.typelib
......@@ -83,3 +83,4 @@ endif
clean-local:
rm -f *~
-include $(top_srcdir)/git.mk
......@@ -18,3 +18,4 @@ DISTCLEANFILES = \
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
......@@ -18,3 +18,4 @@ EXTRA_DIST = \
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
.deps
upowerd
up-self-test
*.o
*-glue.h
*-marshal.c
*-marshal.h
*.conf
*.service
.libs
......@@ -202,6 +202,10 @@ install-data-hook:
CLEANFILES = $(BUILT_SOURCES)
MAINTAINERCLEANFILES = \
$(dbusconf_DATA) \
$(service_DATA)
EXTRA_DIST = \
org.freedesktop.UPower.xml \
org.freedesktop.UPower.Device.xml \
......@@ -215,3 +219,4 @@ EXTRA_DIST = \
clean-local :
rm -f *~ $(service_DATA) $(dbusconf_DATA)
-include $(top_srcdir)/git.mk
.deps
.libs
*.o
*.a
*.lo
*.la
......@@ -29,3 +29,4 @@ endif
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
......@@ -40,3 +40,4 @@ EXTRA_DIST = \
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
.deps
.libs
*.o
*.lo
*.la
......@@ -53,3 +53,4 @@ libupshared_la_CFLAGS = \
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
......@@ -25,3 +25,4 @@ libupshared_la_CFLAGS = \
clean-local :
rm -f *~
-include $(top_srcdir)/git.mk
.deps
upower
*-glue.h
*.o
*-marshal.c
*-marshal.h
.libs
......@@ -31,3 +31,5 @@ CLEANFILES = $(BUILT_SOURCES)
clean-local :
rm -f *~ $(service_DATA) $(dbusconf_DATA)
-include $(top_srcdir)/git.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment