qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 20:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

No longer do the makefiles stat the obj dir for every compile! While I

Browse source 
experienced almost no visible benefit in terms of compile time, others
with older machines will and the makefiles are generally cleaner now.
This commit is contained in:
Joseph Carter 2000-01-04 12:02:27 +00:00
parent 3562cf3e68
commit 6c74e92dd2
3 changed files with 41 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
qw_client/Makefile.in
View file

@ -239,8 +239,8 @@ X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? x11_DIR:
MAKE_SURE_x11_DIR = @DIR=x11; $(MAKE_SURE_DIR) @DIR=x11; $(MAKE_SURE_DIR)
$(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_x11_DIR) $(MAKE_SURE_x11_DIR)
@ -264,7 +264,7 @@ $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_x11_DIR) $(MAKE_SURE_x11_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE) $(X11QUAKE): x11_DIR $(BUILD_DIR)/../$(X11QUAKE)
$(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11) $(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11)
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE) $(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE)
@ -287,8 +287,8 @@ SVGA_VID_SRC = vid_svgalib.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? svga_DIR:
MAKE_SURE_svga_DIR = @DIR=svga; $(MAKE_SURE_DIR) @DIR=svga; $(MAKE_SURE_DIR)
# Not sure why this -O is needed, but it is... # Not sure why this -O is needed, but it is...
$(BUILD_DIR)/svga/vid_svgalib.o: $(COMMON_DIR)/vid_svgalib.c $(BUILD_DIR)/svga/vid_svgalib.o: $(COMMON_DIR)/vid_svgalib.c
@ -317,7 +317,7 @@ $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_svga_DIR) $(MAKE_SURE_svga_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE) $(SVGAQUAKE): svga_DIR $(BUILD_DIR)/../$(SVGAQUAKE)
$(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga) $(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga)
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE) $(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE)
@ -342,32 +342,27 @@ GGI_VID_SRC = vid_ggi.c
# This can be thought of as a macro that makes sure that the ggi # This can be thought of as a macro that makes sure that the ggi
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? ggi_DIR:
MAKE_SURE_ggi_DIR = @DIR=ggi; $(MAKE_SURE_DIR) @DIR=ggi; $(MAKE_SURE_DIR)
$(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $<
ifneq ($(QW_COMMON_DIR),) ifneq ($(QW_COMMON_DIR),)
$(BUILD_DIR)/ggi/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/ggi/%.o: $(QW_COMMON_DIR)/%.c
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $<
endif endif
$(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE) $(GGIQUAKE): ggi_DIR $(BUILD_DIR)/../$(GGIQUAKE)
$(BUILD_DIR)/../$(GGIQUAKE): $(OBJSquake-ggi) $(BUILD_DIR)/../$(GGIQUAKE): $(OBJSquake-ggi)
$(CC) $(CFLAGS) $(OBJSquake-ggi) $(GGI_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GGIQUAKE) $(CC) $(CFLAGS) $(OBJSquake-ggi) $(GGI_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GGIQUAKE)
@ -391,32 +386,27 @@ GL_VID_SRC = gl_vidlinuxglx.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? gl_DIR:
MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR) @DIR=gl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
ifneq ($(QW_COMMON_DIR),) ifneq ($(QW_COMMON_DIR),)
$(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
endif endif
$(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE) $(GLQUAKE): gl_DIR $(BUILD_DIR)/../$(GLQUAKE)
$(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl) $(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE) $(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE)
@ -439,32 +429,27 @@ TDFX_VID_SRC = gl_vidlinux_3dfx.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? 3dfx_DIR:
MAKE_SURE_3dfx_DIR = @DIR=3dfx; $(MAKE_SURE_DIR) @DIR=3dfx; $(MAKE_SURE_DIR)
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
ifneq ($(QW_COMMON_DIR),) ifneq ($(QW_COMMON_DIR),)
$(BUILD_DIR)/3dfx/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/3dfx/%.o: $(QW_COMMON_DIR)/%.c
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
endif endif
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE) $(TDFXQUAKE): 3dfx_DIR $(BUILD_DIR)/../$(TDFXQUAKE)
$(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx) $(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx)
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE) $(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE)
@ -489,32 +474,27 @@ SDL_VID_SRC = vid_sdl.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? sdl_DIR:
MAKE_SURE_sdl_DIR = @DIR=sdl; $(MAKE_SURE_DIR) @DIR=sdl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $<
ifneq ($(QW_COMMON_DIR),) ifneq ($(QW_COMMON_DIR),)
$(BUILD_DIR)/sdl/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/sdl/%.o: $(QW_COMMON_DIR)/%.c
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $<
endif endif
$(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(SDLQUAKE): $(BUILD_DIR)/../$(SDLQUAKE) $(SDLQUAKE): sdl_DIR $(BUILD_DIR)/../$(SDLQUAKE)
$(BUILD_DIR)/../$(SDLQUAKE): $(OBJSquake-sdl) $(BUILD_DIR)/../$(SDLQUAKE): $(OBJSquake-sdl)
$(CC) $(CFLAGS) $(OBJSquake-sdl) $(SDL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SDLQUAKE) $(CC) $(CFLAGS) $(OBJSquake-sdl) $(SDL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SDLQUAKE)

15
qw_server/Makefile.in
View file

@ -85,9 +85,6 @@ GENERAL_SRC = common.c crc.c cvar.c cmd.c mathlib.c wad.c zone.c \
ALL_QW_SRV_SRC = $(GENERAL_SRC) model.c ALL_QW_SRV_SRC = $(GENERAL_SRC) model.c
# XXX - add dos/win specifc source # XXX - add dos/win specifc source
x: Makefile
@echo binaries: $(targets)
@echo other targets: distclean
all: $(targets) all: $(targets)
@ -102,28 +99,26 @@ SRV_CFLAGS = -DSRV $(X_CFLAGS)
# XXX - Don't use X_EXTRA_LIBS below # XXX - Don't use X_EXTRA_LIBS below
SRV_LDFLAGS = @X_EXTRA_LIBS@ SRV_LDFLAGS = @X_EXTRA_LIBS@
MAKE_SURE_srv_DIR = @DIR=srv; $(MAKE_SURE_DIR) srv_DIR:
@DIR=srv; $(MAKE_SURE_DIR)
$(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_srv_DIR)
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/srv/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_srv_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_srv_DIR)
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/srv/%.o: $(QW_COMMON_DIR)/%.c $(BUILD_DIR)/srv/%.o: $(QW_COMMON_DIR)/%.c
$(MAKE_SURE_srv_DIR)
$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_srv_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(SRVQUAKE): $(BUILD_DIR)/../$(SRVQUAKE) $(SRVQUAKE): srv_DIR $(BUILD_DIR)/../$(SRVQUAKE)
$(BUILD_DIR)/../$(SRVQUAKE): $(OBJSqw-server) $(BUILD_DIR)/../$(SRVQUAKE): $(OBJSqw-server)
$(CC) $(CFLAGS) $(OBJSqw-server) $(SRV_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SRVQUAKE) $(CC) $(CFLAGS) $(OBJSqw-server) $(SRV_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SRVQUAKE)

61
uquake/Makefile.in
View file

@ -223,26 +223,22 @@ X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? x11_DIR:
MAKE_SURE_x11_DIR = @DIR=x11; $(MAKE_SURE_DIR) DIR=x11; $(MAKE_SURE_DIR)
$(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_x11_DIR)
$(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/x11/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_x11_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_x11_DIR)
$(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_x11_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE) $(X11QUAKE): x11_DIR $(BUILD_DIR)/../$(X11QUAKE)
$(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11) $(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11)
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE) $(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE)
@ -265,31 +261,26 @@ SVGA_VID_SRC = vid_svgalib.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? svga_DIR:
MAKE_SURE_svga_DIR = @DIR=svga; $(MAKE_SURE_DIR) DIR=svga; $(MAKE_SURE_DIR)
# Not sure why this -O is needed, but it is... # Not sure why this -O is needed, but it is...
$(BUILD_DIR)/svga/vid_svgalib.o: $(COMMON_DIR)/vid_svgalib.c $(BUILD_DIR)/svga/vid_svgalib.o: $(COMMON_DIR)/vid_svgalib.c
$(MAKE_SURE_svga_DIR)
$(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $< $(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_svga_DIR)
$(CC) $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/svga/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_svga_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_svga_DIR)
$(CC) $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_svga_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE) $(SVGAQUAKE): svga_DIR $(BUILD_DIR)/../$(SVGAQUAKE)
$(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga) $(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga)
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE) $(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE)
@ -314,26 +305,22 @@ GGI_VID_SRC = vid_ggi.c
# This can be thought of as a macro that makes sure that the ggi # This can be thought of as a macro that makes sure that the ggi
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? ggi_DIR:
MAKE_SURE_ggi_DIR = @DIR=ggi; $(MAKE_SURE_DIR) DIR=ggi; $(MAKE_SURE_DIR)
$(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/ggi/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GGI_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/ggi/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_ggi_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE) $(GGIQUAKE): ggi_DIR $(BUILD_DIR)/../$(GGIQUAKE)
$(BUILD_DIR)/../$(GGIQUAKE): $(OBJSquake-ggi) $(BUILD_DIR)/../$(GGIQUAKE): $(OBJSquake-ggi)
$(CC) $(CFLAGS) $(OBJSquake-ggi) $(GGI_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GGIQUAKE) $(CC) $(CFLAGS) $(OBJSquake-ggi) $(GGI_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GGIQUAKE)
@ -356,26 +343,22 @@ GL_VID_SRC = gl_vidlinuxglx.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? gl_DIR:
MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR) DIR=gl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE) $(GLQUAKE): gl_DIR $(BUILD_DIR)/../$(GLQUAKE)
$(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl) $(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE) $(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE)
@ -398,26 +381,22 @@ TDFX_VID_SRC = gl_vidlinux_3dfx.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? 3dfx_DIR:
MAKE_SURE_3dfx_DIR = @DIR=3dfx; $(MAKE_SURE_DIR) DIR=3dfx; $(MAKE_SURE_DIR)
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_3dfx_DIR)
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_gl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE) $(TDFXQUAKE): 3dfx_DIR $(BUILD_DIR)/../$(TDFXQUAKE)
$(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx) $(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx)
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE) $(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE)
@ -442,26 +421,22 @@ SDL_VID_SRC = vid_sdl.c
# This can be thought of as a macro that makes sure that the x11 # This can be thought of as a macro that makes sure that the x11
# sub-directory is created # sub-directory is created
# XXX - can we avoid doing every compile? sdl_DIR:
MAKE_SURE_sdl_DIR = @DIR=sdl; $(MAKE_SURE_DIR) DIR=sdl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s $(BUILD_DIR)/sdl/%.o: $(SRC_DIR)/%.s
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s $(BUILD_DIR)/sdl/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_sdl_DIR)
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
$(SDLQUAKE): $(BUILD_DIR)/../$(SDLQUAKE) $(SDLQUAKE): sdl_DIR $(BUILD_DIR)/../$(SDLQUAKE)
$(BUILD_DIR)/../$(SDLQUAKE): $(OBJSquake-sdl) $(BUILD_DIR)/../$(SDLQUAKE): $(OBJSquake-sdl)
$(CC) $(CFLAGS) $(OBJSquake-sdl) $(SDL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SDLQUAKE) $(CC) $(CFLAGS) $(OBJSquake-sdl) $(SDL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SDLQUAKE)