empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make: Tidy up distribution and cleaning of generated makefiles

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-25 13:13:15 +02:00
parent cd3c362a57
commit bb0f3a656e
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Make.mk
View file

@ -101,10 +101,8 @@ subst.in = sed \
# Generated files # Generated files
# See `Cleanliness' below # See `Cleanliness' below
mk := # Generated makefiles, distributed by dist-source from $(srcdir):
ifeq ($(revctrl),git) mk := sources.mk
mk += $(srcdir)/sources.mk
endif
# Generated by Autoconf, not distributed: # Generated by Autoconf, not distributed:
ac := config.h config.log config.status info.html info.nr lib stamp-h ac := config.h config.log config.status info.html info.nr lib stamp-h
ac += $(basename $(filter %.in, $(src))) ac += $(basename $(filter %.in, $(src)))
@ -157,9 +155,12 @@ endif
clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \ clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj) \
info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox info/toc info/TOP.t $(info.all) $(empth_obj) $(empth_lib) sandbox
# Removed by distclean: # Removed by distclean:
distclean := $(ac) $(mk) distclean := $(ac)
ifeq ($(revctrl),git)
distclean += $(addprefix $(srcdir)/, $(mk))
endif
# Distributed by dist-source from $(srcdir): # Distributed by dist-source from $(srcdir):
src_distgen := $(acdist) src_distgen := $(acdist) $(mk)
# Distributed by dist-client from $(srcdir)/src/client; removed by distclean: # Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
cli_distgen := $(acdistcli) cli_distgen := $(acdistcli)
@ -366,10 +367,13 @@ info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc)
.PHONY: dist-source .PHONY: dist-source
dist-source: $(src_distgen) dist-source: $(src_distgen)
$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src)
ifeq ($(revctrl),git) ifeq ($(revctrl),git)
echo "src := $(src)" >$(srcdir)/sources.mk .PHONY: $(srcdir)/sources.mk
$(srcdir)/sources.mk:
$(call quiet-command,echo "src := $(src)" >$@,GEN $@)
endif endif
$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk
.PHONY: dist-client .PHONY: dist-client
dist-client: $(cli_distgen) dist-client: $(cli_distgen)