From d66a7e48d67d310084a57a31652ea561b764e0f7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 28 Jan 2017 18:03:36 -0500 Subject: Makefile: update for autothing v3 --- Makefile | 25 ++++++------------------- 1 file 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 -- cgit v1.1-4-g5e80