Skip to content

Commit

Permalink
Remove 'dist' target
Browse files Browse the repository at this point in the history
We're not producing source tarballs anymore so this has been
bitrotting.
  • Loading branch information
edolstra committed Dec 3, 2020
1 parent 1b0ca38 commit 8ad2c9c
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 35 deletions.
2 changes: 0 additions & 2 deletions doc/manual/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ man-pages := $(foreach n, \

clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8

dist-files += $(man-pages)

# Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox.
dummy-env = env -i \
HOME=/dummy \
Expand Down
6 changes: 0 additions & 6 deletions local.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
ifeq ($(MAKECMDGOALS), dist)
dist-files += $(shell cat .dist-files)
endif

dist-files += configure config.h.in perl/configure

clean-files += Makefile.config

GLOBAL_CXXFLAGS += -Wno-deprecated-declarations
Expand Down
17 changes: 0 additions & 17 deletions mk/dist.mk

This file was deleted.

4 changes: 0 additions & 4 deletions mk/lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ bin-scripts :=
noinst-scripts :=
man-pages :=
install-tests :=
dist-files :=
OS = $(shell uname -s)


Expand Down Expand Up @@ -112,9 +111,6 @@ $(foreach test, $(install-tests), $(eval $(call run-install-test,$(test))))
$(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file))))))


include mk/dist.mk


.PHONY: default all man help

all: $(programs-list) $(libs-list) $(jars-list) $(man-pages)
Expand Down
1 change: 0 additions & 1 deletion mk/libraries.mk
Original file line number Diff line number Diff line change
Expand Up @@ -159,5 +159,4 @@ define build-library
libs-list += $$($(1)_PATH)
endif
clean-files += $$(_d)/*.a $$(_d)/*.$(SO_EXT) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS)
dist-files += $$(_srcs)
endef
1 change: 0 additions & 1 deletion mk/programs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ define build-program

programs-list += $$($(1)_PATH)
clean-files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS)
dist-files += $$(_srcs)

# Phony target to run this program (typically as a dependency of 'check').
.PHONY: $(1)_RUN
Expand Down
2 changes: 0 additions & 2 deletions nix-rust/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ ifeq ($(OS), Darwin)
install_name_tool -id $@ $@
endif

dist-files += $(d)/vendor

clean: clean-rust

clean-rust:
Expand Down
2 changes: 0 additions & 2 deletions src/libexpr/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ $(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l

clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh

dist-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh

$(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644))

$(foreach i, $(wildcard src/libexpr/flake/*.hh), \
Expand Down

0 comments on commit 8ad2c9c

Please sign in to comment.