qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-29 15:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Explicitly list patterns instead of using the following:

Browse source 
$(shell echo $(BUILD_DIR)/{client,common_lib}/%.d)

That does not work properly on various platforms (AIX, SGI, Solaris)
This commit is contained in:
Loring Holden 2000-01-29 23:18:26 +00:00
parent 63e425a7c4
commit 3357d40344
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
qw_client/Makefile.in
View file

@ -20,10 +20,12 @@ mandir := @mandir@
TARGET_DIR := $(PROJECT_ODIR)/targets TARGET_DIR := $(PROJECT_ODIR)/targets
BUILD_DIR := $(TARGET_DIR)/qw_client BUILD_DIR := $(TARGET_DIR)/qw_client
OBJ_PATTERN := $(shell echo $(BUILD_DIR)/{client,common_lib}/%.@OBJEXT@) OBJ_PATTERN := $(BUILD_DIR)/common_lib/%.@OBJEXT@ \
DEP_PATTERN := $(shell echo $(BUILD_DIR)/{client,common_lib}/%.d) $(BUILD_DIR)/client/%.@OBJEXT@
GL_OBJ_PATTERN := $(shell echo $(BUILD_DIR)/client/gl/%.@OBJEXT@)
GL_DEP_PATTERN := $(shell echo $(BUILD_DIR)/client/gl/%.d) DEP_PATTERN := $(BUILD_DIR)/client/%.d $(BUILD_DIR)/common_lib/%.d
GL_OBJ_PATTERN := $(BUILD_DIR)/client/gl/%.@OBJEXT@
GL_DEP_PATTERN := $(BUILD_DIR)/client/gl/%.d
LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
LIBS = @LIBS@ LIBS = @LIBS@
@ -100,7 +102,8 @@ gl_targets = $(GLQUAKE) $(TDFXQUAKE)
lib_targets = $(COMMON_LIB) lib_targets = $(COMMON_LIB)
targets = $(lib_targets) $(soft_targets) $(gl_targets) targets = $(lib_targets) $(soft_targets) $(gl_targets)
CLEAN_TARGETS = $(patsubst %,clean-%, $(targets)) CLEAN_TARGETS = $(patsubst %,clean-%, $(targets))
.PHONY: $(targets) $(CLEAN_TARGETS) clean-soft clean-gl clean-common_lib clean-client .PHONY: $(targets) $(CLEAN_TARGETS) clean-soft clean-gl clean-common_lib \
clean-client
all: $(targets) all: $(targets)
######################################################################## ########################################################################
@ -293,14 +296,14 @@ ALL_COMMON_LIB_OBJS = $(patsubst %,$(BUILD_DIR)/common_lib/%,$(addsuffix \
ALL_COMMON_LIB_DEPS = $(patsubst %,$(BUILD_DIR)/common_lib/%,$(addsuffix .d,\ ALL_COMMON_LIB_DEPS = $(patsubst %,$(BUILD_DIR)/common_lib/%,$(addsuffix .d,\
$(basename $(GENERAL_SRC) .c .s))) $(basename $(GENERAL_SRC) .c .s)))
common_lib_DIR: $(BUILD_DIR)/common_lib:
@DIR=common_lib; $(MAKE_SURE_DIR) @DIR=common_lib; $(MAKE_SURE_DIR)
$(COMMON_LIB): common_lib_DIR $(BUILD_DIR)/common_lib.a $(COMMON_LIB): $(BUILD_DIR)/common_lib $(BUILD_DIR)/common_lib.a
$(BUILD_DIR)/common_lib.a: common_lib_DIR $(ALL_COMMON_LIB_OBJS) $(BUILD_DIR)/common_lib.a: $(BUILD_DIR)/common_lib $(ALL_COMMON_LIB_OBJS)
ar cru $@ $(ALL_COMMON_LIB_OBJS) ar cru $@ $(ALL_COMMON_LIB_OBJS)
ranlib $@ @RANLIB@ $@
# X11 Software target # X11 Software target