Whoever put X11_CFLAGS = ... $(X_CFLAGS) in the Makefile.in's was smoking

something potent.  Should be @X_CFLAGS@, fixed.
This commit is contained in:
Joseph Carter 2000-01-02 11:23:41 +00:00
parent 2417b5129b
commit 9ef97ca84c
2 changed files with 2 additions and 2 deletions

View file

@ -217,7 +217,7 @@ ifneq ($(X11QUAKE),)
# Map the list of source files into a list of object files # Map the list of source files into a list of object files
OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s))) OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s)))
X11_CFLAGS = -DX11 $(X_CFLAGS) X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm
# 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

View file

@ -206,7 +206,7 @@ ifneq ($(X11QUAKE),)
# Map the list of source files into a list of object files # Map the list of source files into a list of object files
OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s))) OBJSquake-x11 = $(patsubst %,$(BUILD_DIR)/x11/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_X11_SRC) .c .s)))
X11_CFLAGS = -DX11 $(X_CFLAGS) X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@ -lm
# 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