diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | buildlib/copy.mak | 27 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 1 | ||||
| -rw-r--r-- | buildlib/makefile.in | 6 | ||||
| -rw-r--r-- | doc/examples/apt.conf | 11 | ||||
| -rw-r--r-- | doc/makefile | 5 | ||||
| -rw-r--r-- | dselect/makefile | 12 |
7 files changed, 57 insertions, 8 deletions
@@ -25,6 +25,7 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean # The startup target builds the necessary configure scripts. It should # be used after a CVS checkout. CONVERTED=environment.mak include/config.h makefile +include buildlib/configure.mak $(BUILDDIR)/include/config.h: buildlib/config.h.in $(BUILDDIR)/environment.mak: buildlib/environment.mak.in -include buildlib/configure.mak +$(BUILDDIR)/makefile: buildlib/makefile.in diff --git a/buildlib/copy.mak b/buildlib/copy.mak new file mode 100644 index 000000000..973c4853b --- /dev/null +++ b/buildlib/copy.mak @@ -0,0 +1,27 @@ +# -*- make -*- + +# This installs arbitary files into a directory + +# Input +# $(SOURCE) - The documents to use +# $(TO) - The directory to put them in +# All output is writtin to files in the build/$(TO) directory + +# See defaults.mak for information about LOCAL + +# Some local definitions +LOCAL := copy-$(firstword $(SOURCE)) +$(LOCAL)-LIST := $(addprefix $(TO)/,$(SOURCE)) + +# Install generation hooks +doc: $($(LOCAL)-LIST) +veryclean: veryclean/$(LOCAL) + +$($(LOCAL)-LIST) : $(TO)/% : % + echo Installing $< to $(@D) + cp $< $(@D) + +# Clean rule +.PHONY: veryclean/$(LOCAL) +veryclean/$(LOCAL): + -rm -rf $($(@F)-LIST) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 549be5385..f03236018 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -62,6 +62,7 @@ LIBRARY_H = $(BASE)/buildlib/library.mak DEBIANDOC_H = $(BASE)/buildlib/debiandoc.mak MANPAGE_H = $(BASE)/buildlib/manpage.mak PROGRAM_H = $(BASE)/buildlib/program.mak +COPY_H = $(BASE)/buildlib/copy.mak # Source location control # SUBDIRS specifies sub components of the module that diff --git a/buildlib/makefile.in b/buildlib/makefile.in index cf808643b..63097b989 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -7,9 +7,9 @@ ifndef NOISY endif SRCDIR=@top_srcdir@ -SUBDIRS:=./docs ./bin ./bin/methods ./obj ./include/apt-pkg ./include/deity -SUBDIRS+=./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \ - ./obj/test ./obj/methods ./obj/methods/ftp +SUBDIRS:=./docs ./docs/examples ./bin ./bin/methods ./obj ./include/apt-pkg \ + ./include/deity ./obj/apt-pkg ./obj/deity ./obj/gui ./obj/cmdline \ + ./obj/test ./obj/methods ./obj/methods/ftp ./dselect BUILD:=$(shell pwd) export BUILD diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf index e89140d47..9403c424a 100644 --- a/doc/examples/apt.conf +++ b/doc/examples/apt.conf @@ -1,4 +1,4 @@ -// $Id: apt.conf,v 1.14 1998/11/23 01:46:01 jgg Exp $ +// $Id: apt.conf,v 1.15 1998/11/23 23:17:49 jgg Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is a completely valid file. @@ -38,11 +38,12 @@ Acquire { Queue-Mode "host"; // host|access -/* http + // HTTP method configuration + http { Proxy "http://127.0.0.1:3128"; - Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting - };*/ + Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting + }; }; // Directory layout @@ -80,6 +81,7 @@ Dir }; }; +// Things that effect the APT dselect method DSelect { Clean "auto"; Options "-f"; @@ -96,4 +98,5 @@ Debug { pkgDPkgPM "false"; pkgInitialize "false"; // This one will dump the configuration space + NoLocking "false"; } diff --git a/doc/makefile b/doc/makefile index 037c8a2e1..46739eff2 100644 --- a/doc/makefile +++ b/doc/makefile @@ -13,3 +13,8 @@ include $(DEBIANDOC_H) # Man pages SOURCE = apt-cache.8 apt-get.8 apt.8 sources.list.5 include $(MANPAGE_H) + +# Examples +SOURCE = examples/apt.conf examples/sources.list +TO = $(DOC) +include $(COPY_H) diff --git a/dselect/makefile b/dselect/makefile new file mode 100644 index 000000000..293b31b6a --- /dev/null +++ b/dselect/makefile @@ -0,0 +1,12 @@ +# -*- make -*- +BASE=.. +SUBDIR=dselect + +# Bring in the default rules +include ../buildlib/defaults.mak + +# DSelect interfacing directory +SOURCE = desc.apt install names setup update +TO = $(BUILD)/dselect +include $(COPY_H) + |