From 4fd6a6d6774aa5fd1240123054955f19eecb75b7 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 31 Jul 2006 14:12:38 +0000 Subject: [PATCH] Everywhere: Rename ytools.mk to proj.mk Replace ytools.mk by proj.mk for consistency reasons: $(TOPDIR)/make/proj.mk should be the project-wide but project-private makefile for projects. --- Makefile | 4 ++-- bin/Makefile | 2 +- make/Makefile | 2 +- make/{ytools.mk.in => proj.mk.in} | 0 scripts/Makefile | 2 +- tmpl/tex/Makefile | 2 +- tmpl/tex/de_contract/Makefile | 2 +- tmpl/tex/de_technical/Makefile | 2 +- tmpl/tex/en_technical/Makefile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename make/{ytools.mk.in => proj.mk.in} (100%) diff --git a/Makefile b/Makefile index 824c51a3..2cd74aa5 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,9 @@ SUBDIRS = inst/pre \ lib include bin \ inst/post -ifneq ($(wildcard $(MODDIR)/make/ytools.mk),) +ifneq ($(wildcard $(MODDIR)/make/proj.mk),) -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/defs.mk include $(MODDIR)/make/subdirs.mk include $(MODDIR)/make/rules.mk diff --git a/bin/Makefile b/bin/Makefile index 5c99fd37..e73e7d52 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -31,7 +31,7 @@ MODDIR = .. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/scripts.mk all: diff --git a/make/Makefile b/make/Makefile index 7588ea1d..15a1d44d 100644 --- a/make/Makefile +++ b/make/Makefile @@ -5,5 +5,5 @@ MODDIR = .. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/make.mk diff --git a/make/ytools.mk.in b/make/proj.mk.in similarity index 100% rename from make/ytools.mk.in rename to make/proj.mk.in diff --git a/scripts/Makefile b/scripts/Makefile index c831fc34..846d1024 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -31,7 +31,7 @@ MODDIR = ../.. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk EXE_SH += cvsbuild diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile index 40c3d391..983cc38e 100644 --- a/tmpl/tex/Makefile +++ b/tmpl/tex/Makefile @@ -1,5 +1,5 @@ MODDIR=.. SUBDIRS = $(FIND_SUBDIRS) -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/dirs.mk diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile index 7697093c..6c7691c3 100644 --- a/tmpl/tex/de_contract/Makefile +++ b/tmpl/tex/de_contract/Makefile @@ -4,5 +4,5 @@ MODDIR = ../.. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile index 7697093c..6c7691c3 100644 --- a/tmpl/tex/de_technical/Makefile +++ b/tmpl/tex/de_technical/Makefile @@ -4,5 +4,5 @@ MODDIR = ../.. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/text.mk diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile index 7697093c..6c7691c3 100644 --- a/tmpl/tex/en_technical/Makefile +++ b/tmpl/tex/en_technical/Makefile @@ -4,5 +4,5 @@ MODDIR = ../.. -include $(MODDIR)/make/ytools.mk +include $(MODDIR)/make/proj.mk include $(MODDIR)/make/text.mk