From bd616bc34bf65a702b2eea3062688c76e1505e77 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 11 Oct 2009 16:01:37 +0200
Subject: Remove support for the dist target

---
 build/bootstrap.make | 11 -----------
 cli/makefile         |  9 ---------
 makefile             |  8 +-------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 3bb9d7e..684eaa1 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -30,25 +30,14 @@ ifdef %interactive%
 
 .PHONY: test $(out_base)/.test \
         install $(out_base)/.install \
-        dist $(out_base)/.dist \
         clean $(out_base)/.clean
 
 test: $(out_base)/.test
 install: $(out_base)/.install
-dist: $(out_base)/.dist
 clean: $(out_base)/.clean
 
 endif
 
-
-# Make sure the distribution prefix is set if the goal is dist.
-#
-ifneq ($(filter $(MAKECMDGOALS),dist),)
-ifeq ($(dist_prefix),)
-$(error dist_prefix is not set)
-endif
-endif
-
 # If we don't have dependency auto-generation then we need to manually
 # make sure that CLI files are compiled before C++ file. To do this we
 # make the object files ($2) depend in order-only on generated files
diff --git a/cli/makefile b/cli/makefile
index 1d4ac42..5a2f771 100644
--- a/cli/makefile
+++ b/cli/makefile
@@ -42,7 +42,6 @@ cxx_obj  := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(cli_tun:.cli=.o))
 cxx_od   := $(cxx_obj:.o=.o.d)
 
 cli      := $(out_base)/cli
-dist     := $(out_base)/.dist
 clean    := $(out_base)/.clean
 install  := $(out_base)/.install
 
@@ -72,12 +71,6 @@ $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
 .PHONY: $(out_base)/
 $(out_base)/: $(cli)
 
-# Dist.
-#
-.PHONY: $(dist)
-
-# @@ TODO
-
 # Install.
 #
 .PHONY: $(install)
@@ -94,7 +87,6 @@ $(clean):                            \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))
 
-
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
@@ -106,7 +98,6 @@ $(clean): $(out_base)/.gitignore.clean
 $(call include,$(bld_root)/git/gitignore.make)
 endif
 
-
 # how to
 #
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/makefile b/makefile
index e61730f..c50b41f 100644
--- a/makefile
+++ b/makefile
@@ -8,11 +8,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make
 default  := $(out_base)/
 test     := $(out_base)/.test
 install  := $(out_base)/.install
-dist     := $(out_base)/.dist
 clean    := $(out_base)/.clean
 
 
-.PHONY: $(default) $(test) $(install) $(dist) $(clean)
+.PHONY: $(default) $(test) $(install) $(clean)
 
 # Build.
 #
@@ -30,11 +29,6 @@ $(install): $(out_base)/cli/.install           \
 	$(call install-data,$(src_base)/NEWS,$(install_doc_dir)/cli/NEWS)
 	$(call install-data,$(src_base)/README,$(install_doc_dir)/cli/README)
 
-# Dist.
-#
-
-# @@ TODO
-
 # Clean.
 #
 $(clean): $(out_base)/cli/.clean      \
-- 
cgit v1.1