From bdf6a39d1c7b699da1c15cd32211387040edb1f7 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sun, 16 Jan 2005 02:21:29 +0000 Subject: [PATCH] Rename BUILD_* to PROJ_* git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19592 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/CommandGuide/Makefile | 26 +++++++++---------- docs/Makefile | 52 ++++++++++++++++++------------------- lib/Target/SparcV9/Makefile | 2 +- projects/Makefile | 4 +-- tools/Makefile | 2 +- tools/llvmc/Makefile | 10 +++---- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/CommandGuide/Makefile b/docs/CommandGuide/Makefile index 836c461801c..bc0d83fe5a4 100644 --- a/docs/CommandGuide/Makefile +++ b/docs/CommandGuide/Makefile @@ -44,13 +44,13 @@ LEVEL := ../.. include $(LEVEL)/Makefile.common -POD := $(wildcard $(BUILD_SRC_DIR)/*.pod) +POD := $(wildcard $(PROJ_SRC_DIR)/*.pod) EXTRA_DIST := $(POD) index.html -HTML = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.html, $(POD)) -MAN = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.1, $(POD)) -PS = $(patsubst $(BUILD_SRC_DIR)/%.pod, $(BUILD_OBJ_DIR)/%.ps, $(POD)) +HTML = $(patsubst $(PROJ_SRC_DIR)/%.pod, $(PROJ_OBJ_DIR)/%.html, $(POD)) +MAN = $(patsubst $(PROJ_SRC_DIR)/%.pod, $(PROJ_OBJ_DIR)/%.1, $(POD)) +PS = $(patsubst $(PROJ_SRC_DIR)/%.pod, $(PROJ_OBJ_DIR)/%.ps, $(POD)) .SUFFIXES: .SUFFIXES: .html .pod .1 .ps @@ -59,30 +59,30 @@ $(HTML) : html/.dir man/.dir man/man1/.dir ps/.dir html: $(HTML) -$(BUILD_OBJ_DIR)/%.html: %.pod +$(PROJ_OBJ_DIR)/%.html: %.pod $(POD2HTML) --css=manpage.css --htmlroot=. --podpath=. \ --noindex --infile=$< --outfile=$@ --title=$* -$(BUILD_OBJ_DIR)/%.1: %.pod - $(POD2MAN) --release=$(PACKAGE_VERSION) \ +$(PROJ_OBJ_DIR)/%.1: %.pod + $(POD2MAN) --release=$(LLVMVersion) \ --center="LLVM Command Guide" $< $@ -$(BUILD_OBJ_DIR)/%.ps: $(BUILD_OBJ_DIR)/%.1 +$(PROJ_OBJ_DIR)/%.ps: $(PROJ_OBJ_DIR)/%.1 $(GROFF) -Tps -man $< > $@ clean-local:: $(Verb) $(RM) -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) -HTML_DIR := $(LLVM_DOCSDIR)/html/CommandGuide -MAN_DIR := $(LLVM_MANDIR)/man1 -PS_DIR := $(LLVM_DOCSDIR)/ps +HTML_DIR := $(PROJ_docsdir)/html/CommandGuide +MAN_DIR := $(PROJ_mandir)/man1 +PS_DIR := $(PROJ_docsdir)/ps install-local:: $(HTML) $(MAN) $(PS) $(Echo) Installing HTML CommandGuide Documentation $(Verb) $(INSTALL) -d $(HTML_DIR) $(Verb) $(INSTALL) -C $(HTML) $(HTML_DIR) - $(Verb) $(INSTALL) -C $(BUILD_SRC_DIR)/index.html $(HTML_DIR) - $(Verb) $(INSTALL) -C $(BUILD_SRC_DIR)/manpage.css $(HTML_DIR) + $(Verb) $(INSTALL) -C $(PROJ_SRC_DIR)/index.html $(HTML_DIR) + $(Verb) $(INSTALL) -C $(PROJ_SRC_DIR)/manpage.css $(HTML_DIR) $(Echo) Installing MAN CommandGuide Documentation $(Verb) $(INSTALL) -d $(MAN_DIR) $(Verb) $(INSTALL) -C $(MAN) $(MAN_DIR) diff --git a/docs/Makefile b/docs/Makefile index 11293d0ebd8..c15f1cc345c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -12,9 +12,9 @@ DIRS := CommandGuide include $(LEVEL)/Makefile.common -HTML := $(wildcard $(BUILD_SRC_DIR)/*.html) \ - $(wildcard $(BUILD_SRC_DIR)/*.css) -IMAGES := $(wildcard $(BUILD_SRC_DIR)/img/*.*) +HTML := $(wildcard $(PROJ_SRC_DIR)/*.html) \ + $(wildcard $(PROJ_SRC_DIR)/*.css) +IMAGES := $(wildcard $(PROJ_SRC_DIR)/img/*.*) DOXYFILES := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \ doxygen.intro EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide img @@ -27,40 +27,40 @@ else install-local:: install-html endif -install-html: $(BUILD_OBJ_DIR)/html.tar.gz +install-html: $(PROJ_OBJ_DIR)/html.tar.gz $(Echo) Installing HTML documentation - $(Verb) $(INSTALL) -d $(LLVM_DOCSDIR)/html - $(Verb) $(INSTALL) -d $(LLVM_DOCSDIR)/html/img - $(Verb) $(INSTALL) -C $(HTML) $(LLVM_DOCSDIR)/html - $(Verb) $(INSTALL) -C $(IMAGES) $(LLVM_DOCSDIR)/html/img - $(Verb) $(INSTALL) -C $(BUILD_OBJ_DIR)/html.tar.gz $(LLVM_DOCSDIR) + $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html + $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html/img + $(Verb) $(INSTALL) -C $(HTML) $(PROJ_docsdir)/html + $(Verb) $(INSTALL) -C $(IMAGES) $(PROJ_docsdir)/html/img + $(Verb) $(INSTALL) -C $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir) -$(BUILD_OBJ_DIR)/html.tar.gz: $(HTML) +$(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) $(Echo) Packaging HTML documentation - $(Verb) $(RM) -rf $@ $(BUILD_OBJ_DIR)/html.tar - $(Verb) cd $(BUILD_SRC_DIR) && \ - $(TAR) cf $(BUILD_OBJ_DIR)/html.tar *.html - $(Verb) $(GZIP) $(BUILD_OBJ_DIR)/html.tar + $(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/html.tar + $(Verb) cd $(PROJ_SRC_DIR) && \ + $(TAR) cf $(PROJ_OBJ_DIR)/html.tar *.html + $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/html.tar install-doxygen: doxygen $(Echo) Installing doxygen documentation $(Echo) Installing doxygen documentation - $(Verb) $(INSTALL) -d $(LLVM_DOCSDIR)/html/doxygen - $(Verb) $(INSTALL) $(BUILD_OBJ_DIR)/doxygen.tar.gz $(LLVM_DOCSDIR) - $(Verb) cd $(BUILD_OBJ_DIR)/doxygen && \ + $(Verb) $(INSTALL) -d $(PROJ_docsdir)/html/doxygen + $(Verb) $(INSTALL) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ $(FIND) . -type f -exec \ - $(INSTALL) -C {} $(LLVM_DOCSDIR)/html/doxygen \; + $(INSTALL) -C {} $(PROJ_docsdir)/html/doxygen \; -doxygen: $(BUILD_OBJ_DIR)/doxygen.tar.gz +doxygen: $(PROJ_OBJ_DIR)/doxygen.tar.gz -$(BUILD_OBJ_DIR)/doxygen.tar.gz: $(DOXYFILES) $(BUILD_OBJ_DIR)/doxygen.cfg +$(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFILES) $(PROJ_OBJ_DIR)/doxygen.cfg $(Echo) Building doxygen documentation - $(Verb) if test -e $(BUILD_OBJ_DIR)/doxygen ; then \ - $(RM) -rf $(BUILD_OBJ_DIR)/doxygen ; \ + $(Verb) if test -e $(PROJ_OBJ_DIR)/doxygen ; then \ + $(RM) -rf $(PROJ_OBJ_DIR)/doxygen ; \ fi - $(Verb) $(DOXYGEN) $(BUILD_OBJ_DIR)/doxygen.cfg + $(Verb) $(DOXYGEN) $(PROJ_OBJ_DIR)/doxygen.cfg $(Echo) Packaging doxygen documentation - $(Verb) $(RM) -rf $@ $(BUILD_OBJ_DIR)/doxygen.tar - $(Verb) $(TAR) cf $(BUILD_OBJ_DIR)/doxygen.tar doxygen - $(Verb) $(GZIP) $(BUILD_OBJ_DIR)/doxygen.tar + $(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen + $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/doxygen.tar diff --git a/lib/Target/SparcV9/Makefile b/lib/Target/SparcV9/Makefile index f7fe5e9f7de..26661cc8e6f 100644 --- a/lib/Target/SparcV9/Makefile +++ b/lib/Target/SparcV9/Makefile @@ -18,7 +18,7 @@ BUILT_SOURCES = \ include $(LEVEL)/Makefile.common -SparcV9.burg.in1 : $(BUILD_SRC_DIR)/SparcV9.burg.in +SparcV9.burg.in1 : $(PROJ_SRC_DIR)/SparcV9.burg.in $(Echo) Pre-processing SparcV9.burg.in $(Verb) $(CXX) -E $(CPP.Flags) -x c++ $< | $(SED) '/^#/d' | $(SED) 's/Ydefine/#define/' > $@ diff --git a/projects/Makefile b/projects/Makefile index ddb9323ba5f..f2a604a55fb 100644 --- a/projects/Makefile +++ b/projects/Makefile @@ -10,7 +10,7 @@ LEVEL=.. include $(LEVEL)/Makefile.config -DIRS:= $(filter-out llvm-test,$(patsubst $(BUILD_SRC_DIR)/%/Makefile,%,$(wildcard $(BUILD_SRC_DIR)/*/Makefile))) +DIRS:= $(filter-out llvm-test,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile))) # Sparc cannot link shared libraries (libtool problem?) which Stacker uses ifeq ($(ARCH), Sparc) @@ -18,4 +18,4 @@ DIRS := $(filter-out Stacker, $(DIRS)) DIRS := $(filter-out sample, $(DIRS)) endif -include $(BUILD_SRC_ROOT)/Makefile.rules +include $(PROJ_SRC_ROOT)/Makefile.rules diff --git a/tools/Makefile b/tools/Makefile index a2c205998b4..e2e4f6911d9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -22,4 +22,4 @@ ifneq ($(LLVM_ON_UNIX),1) PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS)) endif -include $(BUILD_SRC_ROOT)/Makefile.rules +include $(LLVM_SRC_ROOT)/Makefile.rules diff --git a/tools/llvmc/Makefile b/tools/llvmc/Makefile index 0839bc0daa1..729ebdbbc2b 100644 --- a/tools/llvmc/Makefile +++ b/tools/llvmc/Makefile @@ -15,8 +15,8 @@ EXTRA_DIST = c cpp ll st include $(LEVEL)/Makefile.common install:: - @$(ECHO) Installing additional C++ configuration clones - $(Verb)$(INSTALL) $(BUILD_OBJ_DIR)/cpp $(sysconfdir)/cc - $(Verb)$(INSTALL) $(BUILD_OBJ_DIR)/cpp $(sysconfdir)/c++ - $(Verb)$(INSTALL) $(BUILD_OBJ_DIR)/cpp $(sysconfdir)/cxx - $(Verb)$(INSTALL) $(BUILD_OBJ_DIR)/cpp $(sysconfdir)/C + $(Echo) Installing additional C++ configuration clones + $(Verb)$(INSTALL) $(PROJ_OBJ_DIR)/cpp $(sysconfdir)/cc + $(Verb)$(INSTALL) $(PROJ_OBJ_DIR)/cpp $(sysconfdir)/c++ + $(Verb)$(INSTALL) $(PROJ_OBJ_DIR)/cpp $(sysconfdir)/cxx + $(Verb)$(INSTALL) $(PROJ_OBJ_DIR)/cpp $(sysconfdir)/C