diff options
author | Daiki Ueno <ueno@unixuser.org> | 2012-10-31 15:37:30 +0900 |
---|---|---|
committer | Daiki Ueno <ueno@unixuser.org> | 2012-12-30 14:25:41 +0900 |
commit | 4e2469f73fa1f6c0112275b1eadba104f867dd0c (patch) | |
tree | 34ded2400e5d121b6d3282a450b1afdd2b21704f /data | |
parent | 9c6e23a90e40799f3530535fc55b5cb740b6e649 (diff) | |
download | caribou-4e2469f73fa1f6c0112275b1eadba104f867dd0c.tar.gz |
build: use git.mk
Use git.mk to generate .gitignore files upon building.
Also remove *.[ch] from CLEANFILES since it makes little sense
with automake Vala support.
https://bugzilla.gnome.org/show_bug.cgi?id=687315
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/antler/Makefile.am | 2 | ||||
-rw-r--r-- | data/layouts/Makefile.am | 2 | ||||
-rw-r--r-- | data/layouts/fullscale/Makefile.am | 2 | ||||
-rw-r--r-- | data/layouts/scan/Makefile.am | 2 | ||||
-rw-r--r-- | data/layouts/touch/Makefile.am | 4 |
6 files changed, 13 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 6d686a7..16e9b1f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -41,3 +41,5 @@ CLEANFILES = $(desktop_DATA) \ $(gsettings_schemas_in_files) \ $(gsettings_SCHEMAS) \ $(servicefile_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/antler/Makefile.am b/data/antler/Makefile.am index f703037..9296728 100644 --- a/data/antler/Makefile.am +++ b/data/antler/Makefile.am @@ -3,3 +3,5 @@ cssfiles_DATA = \ style.css \ dark-key-border.svg EXTRA_DIST = $(cssfiles_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/layouts/Makefile.am b/data/layouts/Makefile.am index 3613053..fd73610 100644 --- a/data/layouts/Makefile.am +++ b/data/layouts/Makefile.am @@ -1 +1,3 @@ SUBDIRS = scan touch fullscale + +-include $(top_srcdir)/git.mk diff --git a/data/layouts/fullscale/Makefile.am b/data/layouts/fullscale/Makefile.am index c560f7b..7d3eae9 100644 --- a/data/layouts/fullscale/Makefile.am +++ b/data/layouts/fullscale/Makefile.am @@ -16,3 +16,5 @@ common_files = \ EXTRA_DIST = $(fullscalelayouts_in_files) $(common_files) CLEANFILES = $(fullscalelayouts_DATA) $(fullscalelayouts_in_files:.xml.in=.xsl) + +-include $(top_srcdir)/git.mk diff --git a/data/layouts/scan/Makefile.am b/data/layouts/scan/Makefile.am index 39f7fce..4c1ebc7 100644 --- a/data/layouts/scan/Makefile.am +++ b/data/layouts/scan/Makefile.am @@ -4,3 +4,5 @@ scanlayouts_DATA = \ us.xml EXTRA_DIST = $(scanlayouts_DATA) + +-include $(top_srcdir)/git.mk diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am index a3389d8..755107f 100644 --- a/data/layouts/touch/Makefile.am +++ b/data/layouts/touch/Makefile.am @@ -17,4 +17,6 @@ common_files = \ EXTRA_DIST = $(touchlayouts_in_files) $(common_files) -CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl)
\ No newline at end of file +CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl) + +-include $(top_srcdir)/git.mk |