summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-07-02 07:12:44 +0000
committerIan Romanick <idr@us.ibm.com>2005-07-02 07:12:44 +0000
commit4f178c6e3a95848257edc4623c72fb0a8eebf282 (patch)
treedeac88f661ed631a8f42d5a58d7409d8490c740a /progs
parentef2ce9d003fc69741bb02262f89ea35e948cbb5b (diff)
Add $(CFLAGS) to the link commands. This makes 'make linux-x86
ARCH_FLAGS=-m32' work correctly on x86-64 systems.
Diffstat (limited to 'progs')
-rw-r--r--progs/xdemos/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index ddd1b0bfee..bff6b71ca4 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -51,10 +51,10 @@ clean:
# special cases
pbinfo: pbinfo.o pbutil.o
- $(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
pbdemo: pbdemo.o pbutil.o
- $(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
pbinfo.o: pbinfo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -66,13 +66,13 @@ pbutil.o: pbutil.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
- $(CC) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
+ $(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
xrotfontdemo: xrotfontdemo.o xuserotfont.o
- $(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
+ $(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
xuserotfont.o: xuserotfont.c xuserotfont.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c