From 2c52cef60517ec75affdda8dd873fdbc1ff90369 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 20 Jul 2002 17:16:40 +0000 Subject: [PATCH] bin, make, scripts, tmpl/tex: Add include $(MODDIR)/make/ytools.mk --- bin/Makefile | 1 + make/Makefile | 1 + make/doc.mk | 2 +- make/ytools.mk.in | 10 +++++++++- scripts/Makefile | 1 + tmpl/tex/Makefile | 2 ++ tmpl/tex/de_contract/Makefile | 1 + tmpl/tex/de_technical/Makefile | 1 + tmpl/tex/en_technical/Makefile | 1 + 9 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index f095e5fa..648ad0e3 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -33,6 +33,7 @@ MODDIR = .. CLEAN += $(wildcard *.sh) +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/scripts.mk all: diff --git a/make/Makefile b/make/Makefile index 27369b78..a8f56c38 100644 --- a/make/Makefile +++ b/make/Makefile @@ -4,4 +4,5 @@ # $Id$ MODDIR = .. +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/make.mk diff --git a/make/doc.mk b/make/doc.mk index 844d6d7c..abe32d17 100644 --- a/make/doc.mk +++ b/make/doc.mk @@ -12,7 +12,7 @@ install: $(INSTALLED_DOCS_DEVEL) else install: $(INSTALLED_DOCS_DIST) endif -clean distclean: +clean: rm -rf *~ .*.swp diff --git a/make/ytools.mk.in b/make/ytools.mk.in index ad7902f0..78564faa 100644 --- a/make/ytools.mk.in +++ b/make/ytools.mk.in @@ -4,7 +4,7 @@ # $Id$ PROJECT := ytools - +TOPDIR = $(MODDIR) REQUIRED = inst/pre \ make \ @@ -26,3 +26,11 @@ REQUIRED = inst/pre \ VERSION = @PACKAGE_VERSION@ VERSION_STR = \"@PACKAGE_VERSION@\" +DEVELOPMENT = @IS_DEVELOPMENT_VERSION@ + +ifeq ($(DEVELOPMENT),true) + include $(TOPDIR)/make/cfg_dev.mk +else + include $(TOPDIR)/make/cfg_dist.mk +endif + diff --git a/scripts/Makefile b/scripts/Makefile index 8dec072a..da6bb480 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -31,6 +31,7 @@ MODDIR = ../.. +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/scripts.mk #INSTALL_BINDIR = $(ENV_PREFIX)/$(HOME)/bin diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile index f1503104..754c2921 100644 --- a/tmpl/tex/Makefile +++ b/tmpl/tex/Makefile @@ -1,3 +1,5 @@ MODDIR=.. SUBDIRS = $(shell find . -type d -maxdepth 1 | grep -ve "CVS\|nomake" | grep /) + +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/dirs.mk diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile index 4688e7bc..7697093c 100644 --- a/tmpl/tex/de_contract/Makefile +++ b/tmpl/tex/de_contract/Makefile @@ -4,4 +4,5 @@ MODDIR = ../.. +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile index 4688e7bc..7697093c 100644 --- a/tmpl/tex/de_technical/Makefile +++ b/tmpl/tex/de_technical/Makefile @@ -4,4 +4,5 @@ MODDIR = ../.. +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile index 4688e7bc..7697093c 100644 --- a/tmpl/tex/en_technical/Makefile +++ b/tmpl/tex/en_technical/Makefile @@ -4,4 +4,5 @@ MODDIR = ../.. +include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/text.mk