summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2017-01-28 18:03:36 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2017-01-28 18:03:36 -0500
commitd66a7e48d67d310084a57a31652ea561b764e0f7 (patch)
tree1e09f427f308494e98d1628d50a51cc20e2e896b
parent448b71ad9d9387571e9a92f2fe4598ab5346c58c (diff)
Makefile: update for autothing v3
-rw-r--r--Makefile25
1 files changed, 6 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index b3c7379..29cc482 100644
--- a/Makefile
+++ b/Makefile
@@ -5,25 +5,17 @@ EDIT = { m4 -P | sed -e 's|@bash@|$(bash)|g' -e 's|@VERSION@|$(VERSION)|'; }
PACKAGE = emacsutils
VERSION = 0.9
-topoutdir=.
-topsrcdir=.
+topoutdir ?= .
+topsrcdir ?= .
include $(topoutdir)/build-aux/Makefile.head.mk
-
-ifeq ($(wildcard .git/),)
-include .srcfiles.mk
-else
-.srcfiles.mk: FORCE
- @git ls-files | sed 's|^|std.src_files += |' | $(WRITE_IFCHANGED) $@
--include .srcfiles.mk
-endif
-
programs = ediff emacsmail emacsterm emacsterm-rxvt emacsterm-xterm
desktops = emacsmail emacsterm
-std.out_files = $(programs) $(addsuffix .desktop,$(desktops))
-std.sys_files = $(addprefix $(bindir)/,$(programs)) $(foreach d,$(desktops),$(datarootdir)/applications/$d.desktop)
-std.clean_files += *.sh
+
+files.out.all = $(programs) $(addsuffix .desktop,$(desktops))
+files.sys.all = $(addprefix $(bindir)/,$(programs)) $(foreach d,$(desktops),$(datarootdir)/applications/$d.desktop)
+files.out.int += *.sh
%.sh: %.sh.in common.sh.in .var.bash .var.VERSION
$(EDIT) < $< > $@
@@ -35,11 +27,6 @@ $(DESTDIR)$(datarootdir)/applications/%: %
$(NORMAL_INSTALL)
$(INSTALL_DATA) $< $@
-.var.%: FORCE
- @printf '%s' '$($*)' | sed 's|^|#|' | $(WRITE_IFCHANGED) '$@'
--include $(wildcard .var.*)
-
-.PHONY: PHONY FORCE
.DELETE_ON_ERROR:
.SECONDARY:
include $(topoutdir)/build-aux/Makefile.tail.mk