make: Cleanup commit

This commit is contained in:
Jan Lindemann 2002-07-10 12:24:05 +00:00 committed by Jan Lindemann
commit ba0c77c3ac
5 changed files with 63 additions and 23 deletions

View file

@ -5,7 +5,9 @@
ifndef PROJECT
PROJECT := ytools
REQUIRED = make \
endif
REQUIRED = inst/pre \
make \
doc \
debug misc slog platform \
devutil \
@ -19,8 +21,8 @@ ifndef PROJECT
YMisc YError \
YThread YMutex YEvent YCbContr contr/Y2WayMap \
YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
lib include bin
endif
lib include bin \
inst/post
LIBNAME := $(PROJECT)
@ -108,6 +110,7 @@ INSTALL_LIBDIR = $(PREFIX)/lib
INSTALL_HDRDIR = $(PREFIX)/include
INSTALL_MKDIR = $(PREFIX)/make
INSTALL_BINDIR = $(PREFIX)/bin
BUILD_BINDIR = $(TOPDIR)/bin
INSTALL_DOCDIR_DIST = $(DOC_PREFIX)
INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
@ -126,7 +129,11 @@ INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
INSTALLED_EXE = $(INSTALL_BINDIR)/$(EXE)
INSTALLED_EXE_SH = $(addprefix $(INSTALL_BINDIR)/,$(EXE_SH))
INSTALLED_EXE_BIN = $(addprefix $(INSTALL_BINDIR)/,$(EXE_BIN))
INSTALLED_MKFILES = $(addprefix $(INSTALL_MKDIR)/,$(MKFILES))
INSTALLED_H = $(addprefix $(INSTALL_HDRDIR)/,$(LOCAL_H))
INSTALLED_PROFILE_PATH_SCRIPT = $(ENV_PREFIX)/etc/profile.d/path_$(PROJECT).sh
MEMBERS = $(LIB_A)($(OBJ))
#PREFIX = ../# CAUTION: This breaks the installation in the project
@ -171,6 +178,10 @@ else
LPPFLAGS += -lstdc++ -L/usr/local/lib
endif
ifeq ($(LIBTYPE),shared)
LDFLAGS += -rdynamic
endif
ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS = -l$(LIBNAME)
endif
@ -194,7 +205,7 @@ RM = rm
AR = ar
ifneq ($(wildcard $(MODDIR)/devutil/scripts),)
MOD_SCRIPT_DIR = $(MODDIR)/bin
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
else
MOD_SCRIPT_DIR = $(MODDIR)/bin
endif