Environment Variable renamed

This commit is contained in:
Enno Rehling 2002-09-12 20:45:34 +00:00
parent 7aed7ca39c
commit 08b74392c5
11 changed files with 19 additions and 19 deletions

View File

@ -1,7 +1,7 @@
## include this File in all Makefiles for Eressea ## include this File in all Makefiles for Eressea
ifndef ERESSEA ifndef ERESSEA_SRC
export ERESSEA=$(PWD) export ERESSEA_SRC=$(PWD)
endif endif
.PHONY: tags .PHONY: tags
@ -19,7 +19,7 @@ INSTALL = @cp
ARFLAGS = crs ARFLAGS = crs
CTAGSFLAGS = --c-types=cdefgmnstuv CTAGSFLAGS = --c-types=cdefgmnstuv
CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \ CFLAGS = -I$(ERESSEA_SRC) -Wall -Wwrite-strings -Wstrict-prototypes \
-Werror-implicit-function-declaration \ -Werror-implicit-function-declaration \
-Wno-char-subscripts $(INCLUDES) -Wno-char-subscripts $(INCLUDES)
LDFLAGS = $(LIBS) LDFLAGS = $(LIBS)
@ -42,7 +42,7 @@ MSG_SUBDIR = "--> Making $@ in $$subdir"
## user-defined makefiles ## user-defined makefiles
## ##
MKFILES = $(wildcard $(ERESSEA)/$(USER).mk $(ERESSEA)/$(OSTYPE).mk $(ERESSEA)/$(HOSTTYPE).mk $(ERESSEA)/$(ARCH).mk) MKFILES = $(wildcard $(ERESSEA_SRC)/$(USER).mk $(ERESSEA_SRC)/$(OSTYPE).mk $(ERESSEA_SRC)/$(HOSTTYPE).mk $(ERESSEA_SRC)/$(ARCH).mk)
ifeq ($(MKFILES), ) ifeq ($(MKFILES), )
else else
include $(MKFILES) include $(MKFILES)
@ -106,7 +106,7 @@ endif
# ifeq ($(CONFIG), lint) # ifeq ($(CONFIG), lint)
# BUILD_DIR = Lint-$(ARCHITECTURE) # BUILD_DIR = Lint-$(ARCHITECTURE)
# CC = lint # CC = lint
# CFLAGS = -I$(ERESSEA) $(INCLUDES) -booltype boolean -boolops # CFLAGS = -I$(ERESSEA_SRC) $(INCLUDES) -booltype boolean -boolops
# LDFLAGS = # LDFLAGS =
# LIBS = # LIBS =
# endif # endif
@ -132,10 +132,10 @@ endif
# #
tags: tags:
@echo "Creating tags in `pwd`/tags"; @echo "Creating tags in `pwd`/tags";
$(CTAGS) $(CTAGSFLAGS) --recurse=yes -f $(ERESSEA)/tags $(ERESSEA) $(CTAGS) $(CTAGSFLAGS) --recurse=yes -f $(ERESSEA_SRC)/tags $(ERESSEA_SRC)
PUBLISH_DIR = $(ERESSEA)/$(BUILD_DIR) PUBLISH_DIR = $(ERESSEA_SRC)/$(BUILD_DIR)
env: env:
@$(MAKEENV) @$(MAKEENV)
@ -180,7 +180,7 @@ clean:: $(BUILD_DIR) $(PUBLISH_DIR)
rm -fr Release-$(ARCHITECTURE)/* Debug-$(ARCHITECTURE)/* Profile-$(ARCHITECTURE)/* Dmalloc-$(ARCHITECTURE)/* Ccmalloc-$(ARCHITECTURE) Lint-$(ARCHITECTURE)/* rm -fr Release-$(ARCHITECTURE)/* Debug-$(ARCHITECTURE)/* Profile-$(ARCHITECTURE)/* Dmalloc-$(ARCHITECTURE)/* Ccmalloc-$(ARCHITECTURE) Lint-$(ARCHITECTURE)/*
lint:: lint::
$(LINT) -I$(ERESSEA) $(INCLUDES) $(LINTFLAGS) *.c $(LINT) -I$(ERESSEA_SRC) $(INCLUDES) $(LINTFLAGS) *.c
$(BUILD_DIR) $(PUBLISH_DIR): $(BUILD_DIR) $(PUBLISH_DIR):
@mkdir $@ @mkdir $@
@ -199,6 +199,6 @@ $(BUILD_DIR)/%.o:: %.c
ifeq ($(CONVERT_TRIGGERS), 1) ifeq ($(CONVERT_TRIGGERS), 1)
CFLAGS += -DCONVERT_TRIGGER CFLAGS += -DCONVERT_TRIGGER
INCLUDES += -I. -I$(ERESSEA)/eressea/old INCLUDES += -I. -I$(ERESSEA_SRC)/eressea/old
endif endif

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -7,7 +7,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ BINARY =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## more definitions ## more definitions

View File

@ -6,7 +6,7 @@ EXENAME =
SOURCES = $(wildcard *.c) SOURCES = $(wildcard *.c)
OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o) OBJECTS = $(SOURCES:%.c=$(BUILD_DIR)/%.o)
include $(ERESSEA)/Makefile.include include $(ERESSEA_SRC)/Makefile.include
## ##
## more definitions ## more definitions