summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-03-03 00:36:34 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-03-03 00:36:34 -0500
commitba29df2ef0ab32313e332ce7ce4e086f29d8d07d (patch)
tree55eaa8a7fee166fc876e92e94229082b3a8d61ed /modules
parent15b67942e56de4e0068f0870f257e852cd8b7c00 (diff)
buildsystem
Diffstat (limited to 'modules')
-rw-r--r--modules/Makefile8
-rw-r--r--modules/blobs/Makefile.inc.mk8
-rw-r--r--modules/comments/Makefile.inc.mk4
-rw-r--r--modules/date.author/Makefile.inc.mk4
l---------modules/git-fast-import/.#parse.sh1
-rw-r--r--modules/module.mk11
-rw-r--r--modules/tags/Makefile.inc.mk4
-rw-r--r--modules/tree/Makefile.inc.mk4
8 files changed, 22 insertions, 22 deletions
diff --git a/modules/Makefile b/modules/Makefile
index 8235bf3..d9de6c0 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -15,10 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
include $(dir $(lastword $(MAKEFILE_LIST)))/../config.mk
-include $(topsrcdir)/common.top.mk
+include $(topsrcdir)/automake.head.mk
dirs += $(DESTDIR)$(pkglibexecdir)/modules
-src_files += Makefile module.mk
-subdirs = comments date.author blobs tags tree
+makefiles = Makefile module.mk
+am_subdirs = comments date.author blobs tags tree
-include $(topsrcdir)/common.bottom.mk
+include $(topsrcdir)/automake.tail.mk
diff --git a/modules/blobs/Makefile.inc.mk b/modules/blobs/Makefile.inc.mk
index 8fd2d6f..9f3f112 100644
--- a/modules/blobs/Makefile.inc.mk
+++ b/modules/blobs/Makefile.inc.mk
@@ -1,8 +1,8 @@
-src_files += commit.d.sh commit.f.sh commit.sh get.d.sh get.f.sh get.sh ls.sh print.sh tree.sh
-out_files += commit.d commit.f commit get.d get.f get ls print tree
+am_src_files += commit.d.sh commit.f.sh commit.sh get.d.sh get.f.sh get.sh ls.sh print.sh tree.sh
+am_out_files += commit.d commit.f commit get.d get.f get ls print tree
-src_files += _stdio.sh
-sys_files += $(pkglibexecdir)/modules/$(name)/_stdio.sh
+am_src_files += _stdio.sh
+am_sys_files += $(pkglibexecdir)/modules/$(name)/_stdio.sh
$(DESTDIR)$(pkglibexecdir)/modules/$(name)/_stdio.sh: $(srcdir)/_stdio.sh | $(DESTDIR)$(pkglibexecdir)/modules/$(name)
$(INSTALL_DATA) $< $@
diff --git a/modules/comments/Makefile.inc.mk b/modules/comments/Makefile.inc.mk
index 6816836..d5632d7 100644
--- a/modules/comments/Makefile.inc.mk
+++ b/modules/comments/Makefile.inc.mk
@@ -1,2 +1,2 @@
-src_files += comment.sh commit.sh print.sh showcomment.sh
-out_files += comment commit print showcomment
+am_src_files += comment.sh commit.sh print.sh showcomment.sh
+sm_out_files += comment commit print showcomment
diff --git a/modules/date.author/Makefile.inc.mk b/modules/date.author/Makefile.inc.mk
index c6b27a2..ac9d0df 100644
--- a/modules/date.author/Makefile.inc.mk
+++ b/modules/date.author/Makefile.inc.mk
@@ -1,2 +1,2 @@
-src_files += commit.sh
-out_files += commit
+am_src_files += commit.sh
+am_out_files += commit
diff --git a/modules/git-fast-import/.#parse.sh b/modules/git-fast-import/.#parse.sh
deleted file mode 120000
index c2c97da..0000000
--- a/modules/git-fast-import/.#parse.sh
+++ /dev/null
@@ -1 +0,0 @@
-luke@build64-par.lan.670:1436421582 \ No newline at end of file
diff --git a/modules/module.mk b/modules/module.mk
index d3d3da2..b2dbde8 100644
--- a/modules/module.mk
+++ b/modules/module.mk
@@ -15,15 +15,16 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/common.top.mk
+include $(topsrcdir)/automake.head.mk
name := $(lastword $(subst /, ,$(abspath $(srcdir))))
include $(srcdir)/Makefile.inc.mk
+makefiles = Makefile Makefile.inc.mk
dirs += $(DESTDIR)$(pkglibexecdir)/modules/$(name)
-src_files += Makefile Makefile.inc.mk Module.mk
-sys_files += $(pkglibexecdir)/modules/$(name).mk
-sys_files += $(addprefix $(pkglibexecdir)/modules/$(name)/,$(out_files))
+am_src_files += Module.mk
+am_sys_files += $(pkglibexecdir)/modules/$(name).mk
+am_sys_files += $(addprefix $(pkglibexecdir)/modules/$(name)/,$(am_out_files))
$(DESTDIR)$(pkglibexecdir)/modules/$(name).mk: $(srcdir)/Module.mk | $(DESTDIR)$(pkglibexecdir)/modules
$(INSTALL_DATA) $< $@
@@ -32,4 +33,4 @@ $(DESTDIR)$(pkglibexecdir)/modules/$(name)/%: $(srcdir)/% | $(DESTDIR)$(pkglibex
$(DESTDIR)$(pkglibexecdir)/modules/$(name)/%: $(outdir)/% | $(DESTDIR)$(pkglibexecdir)/modules/$(name)
$(INSTALL_PROGRAM) $< $@
-include $(topsrcdir)/common.bottom.mk
+include $(topsrcdir)/automake.tail.mk
diff --git a/modules/tags/Makefile.inc.mk b/modules/tags/Makefile.inc.mk
index 8d687a5..1ccdada 100644
--- a/modules/tags/Makefile.inc.mk
+++ b/modules/tags/Makefile.inc.mk
@@ -1,2 +1,2 @@
-src_files += commit.sh get-tag.sh print.sh tag-id.sh tag.sh
-out_files += commit get-tag print tag-id tag
+am_src_files += commit.sh get-tag.sh print.sh tag-id.sh tag.sh
+am_out_files += commit get-tag print tag-id tag
diff --git a/modules/tree/Makefile.inc.mk b/modules/tree/Makefile.inc.mk
index 82c0b58..c91bef2 100644
--- a/modules/tree/Makefile.inc.mk
+++ b/modules/tree/Makefile.inc.mk
@@ -1,2 +1,2 @@
-src_files += addparent.d.sh addparent.f.sh addparent.sh commit.sh delparent.f.sh getchildren.sh getparents.sh print.sh
-out_files += addparent.d addparent.f addparent commit delparent.f getchildren getparents print
+am_src_files += addparent.d.sh addparent.f.sh addparent.sh commit.sh delparent.f.sh getchildren.sh getparents.sh print.sh
+am_out_files += addparent.d addparent.f addparent commit delparent.f getchildren getparents print