more fixings for "make install"

This commit is contained in:
Bill Currie 2000-03-15 01:09:48 +00:00
parent c6b2c1ea3e
commit a7d766abc9
3 changed files with 22 additions and 14 deletions

View file

@ -3,10 +3,18 @@
# Quake general stuff # Quake general stuff
# #
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir = @datadir@
top_builddir = .. top_builddir = ..
PROJECT_DIR := @top_srcdir@ PROJECT_DIR := ${top_srcdir}
BIN_PREFIX := common BIN_PREFIX := common
SRC_DIR := @srcdir@
MODULE := common MODULE := common
OBJ_PATTERN = $(BUILD_DIR)/sound_lib/%.o $(BUILD_DIR)/common_lib/%.o OBJ_PATTERN = $(BUILD_DIR)/sound_lib/%.o $(BUILD_DIR)/common_lib/%.o
@ -15,11 +23,11 @@ include $(top_builddir)/Rules.mk
SOUND_LIB := sound_lib.a SOUND_LIB := sound_lib.a
lib_targets = $(SOUND_LIB) $(CD_LIB) $(COMMON_LIB) lib_targets = $(SOUND_LIB) $(CD_LIB) $(COMMON_LIB)
targets = $(lib_targets) targets =
CLEAN_TARGETS = $(patsubst %,clean-%, $(targets)) CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
.PHONY: $(targets) $(CLEAN_TARGETS) .PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS)
all: $(targets) all: $(lib_targets) $(targets)
######################################################################## ########################################################################
# #
# Source files # Source files

View file

@ -65,11 +65,11 @@ endif
soft_targets = $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(X11QUAKE) $(MGLQUAKE) soft_targets = $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(X11QUAKE) $(MGLQUAKE)
gl_targets = $(GLQUAKE) $(TDFXQUAKE) gl_targets = $(GLQUAKE) $(TDFXQUAKE)
lib_targets = $(COMMON_LIB) lib_targets = $(COMMON_LIB)
targets = $(lib_targets) $(soft_targets) $(gl_targets) targets = $(soft_targets) $(gl_targets)
CLEAN_TARGETS = $(patsubst %,clean-%, $(soft_targets) $(gl_targets)) CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
.PHONY: $(targets) $(CLEAN_TARGETS) .PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS)
all: $(targets) all: $(lib_targets) $(targets)
######################################################################## ########################################################################
# #
# Source files # Source files

View file

@ -63,11 +63,11 @@ soft_targets = $(X11QUAKE) $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(MGLQUAKE) \
$(VGAQUAKE) $(VGAQUAKE)
gl_targets = $(GLQUAKE) $(TDFXQUAKE) gl_targets = $(GLQUAKE) $(TDFXQUAKE)
lib_targets = $(COMMON_LIB) lib_targets = $(COMMON_LIB)
targets = $(lib_targets) $(gl_targets) $(soft_targets) targets = $(gl_targets) $(soft_targets)
CLEAN_TARGETS = $(patsubst %,clean-%, $(gl_targets) $(soft_targets)) CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
.PHONY: $(targets) $(CLEAN_TARGETS) clean-soft clean-gl .PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS) clean-soft clean-gl
all: $(targets) all: $(lib_targets) $(targets)
######################################################################## ########################################################################
# #