summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2011-07-19 12:25:34 +0100
committerRichard Hughes <richard@hughsie.com>2011-07-19 12:40:21 +0100
commitb19fca96371d65d3bb1069385ede8b66de31aefa (patch)
treea54997e2482ded94a1466a95d6737ba8acb46165
parent75894ebb2e414047e153fbbbfa6d291b76be4f8d (diff)
Use git.mk and remove the manual .gitignore files
-rw-r--r--.gitignore56
-rw-r--r--Makefile.am22
-rw-r--r--doc/.gitignore16
-rw-r--r--doc/Makefile.am15
-rw-r--r--doc/dbus/.gitignore3
-rw-r--r--doc/dbus/Makefile.am4
-rw-r--r--doc/man/Makefile.am4
-rw-r--r--etc/Makefile.am1
-rw-r--r--git.mk200
-rw-r--r--libupower-glib/.gitignore14
-rw-r--r--libupower-glib/Makefile.am1
-rw-r--r--policy/.gitignore2
-rw-r--r--policy/Makefile.am1
-rw-r--r--rules/Makefile.am1
-rw-r--r--src/.gitignore11
-rw-r--r--src/Makefile.am5
-rw-r--r--src/dummy/.gitignore7
-rw-r--r--src/dummy/Makefile.am1
-rw-r--r--src/freebsd/Makefile.am1
-rw-r--r--src/linux/.gitignore6
-rw-r--r--src/linux/Makefile.am1
-rw-r--r--src/openbsd/Makefile.am1
-rw-r--r--tools/.gitignore8
-rw-r--r--tools/Makefile.am2
24 files changed, 255 insertions, 128 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7b0810c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,56 +0,0 @@
-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*
diff --git a/Makefile.am b/Makefile.am
index eab67da..ee9ec84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 6d049dc..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
-*.types
-*.stamp
-html
-*.7
-*.8
-*.1
-tmpl
-version.xml
-xml
-.libs
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79695b8..9a27a58 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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
diff --git a/doc/dbus/.gitignore b/doc/dbus/.gitignore
deleted file mode 100644
index 7879383..0000000
--- a/doc/dbus/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.ref.xml
-*.ref.xml
-
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 5275f16..2061cb9 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -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
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 6a7489f..cb3dedc 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -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
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 3e39412..94d5548 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -4,3 +4,4 @@ config_DATA = UPower.conf
EXTRA_DIST = \
$(config_DATA)
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# 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
diff --git a/libupower-glib/.gitignore b/libupower-glib/.gitignore
deleted file mode 100644
index 734a709..0000000
--- a/libupower-glib/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-.deps
-.libs
-*.o
-*.la
-*.lo
-*-marshal.c
-*-marshal.h
-*.gcov
-*.gcda
-*.gcno
-up-version.h
-*.gir
-*.typelib
-
diff --git a/libupower-glib/Makefile.am b/libupower-glib/Makefile.am
index f3790a6..42d7ed6 100644
--- a/libupower-glib/Makefile.am
+++ b/libupower-glib/Makefile.am
@@ -83,3 +83,4 @@ endif
clean-local:
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/policy/.gitignore b/policy/.gitignore
deleted file mode 100644
index 0266697..0000000
--- a/policy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.policy
-
diff --git a/policy/Makefile.am b/policy/Makefile.am
index 1a962d2..7a25230 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -18,3 +18,4 @@ DISTCLEANFILES = \
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/rules/Makefile.am b/rules/Makefile.am
index a9fd4e9..1564b40 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -18,3 +18,4 @@ EXTRA_DIST = \
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 67fe152..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-upowerd
-up-self-test
-*.o
-*-glue.h
-*-marshal.c
-*-marshal.h
-*.conf
-*.service
-.libs
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b54fb2..b88f842 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
diff --git a/src/dummy/.gitignore b/src/dummy/.gitignore
deleted file mode 100644
index 412ad37..0000000
--- a/src/dummy/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-*.o
-*.a
-*.lo
-*.la
-
diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am
index d43058e..dcd30af 100644
--- a/src/dummy/Makefile.am
+++ b/src/dummy/Makefile.am
@@ -29,3 +29,4 @@ endif
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am
index 5da5ce9..9d91542 100644
--- a/src/freebsd/Makefile.am
+++ b/src/freebsd/Makefile.am
@@ -40,3 +40,4 @@ EXTRA_DIST = \
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/src/linux/.gitignore b/src/linux/.gitignore
deleted file mode 100644
index 76b9072..0000000
--- a/src/linux/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.o
-*.lo
-*.la
-
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index e2dcd85..520b4cf 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -53,3 +53,4 @@ libupshared_la_CFLAGS = \
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/src/openbsd/Makefile.am b/src/openbsd/Makefile.am
index 8557baf..472eb50 100644
--- a/src/openbsd/Makefile.am
+++ b/src/openbsd/Makefile.am
@@ -25,3 +25,4 @@ libupshared_la_CFLAGS = \
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index ca8d160..0000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-upower
-*-glue.h
-*.o
-*-marshal.c
-*-marshal.h
-.libs
-
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4b176bd..df1d2e7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -31,3 +31,5 @@ CLEANFILES = $(BUILT_SOURCES)
clean-local :
rm -f *~ $(service_DATA) $(dbusconf_DATA)
+
+-include $(top_srcdir)/git.mk