summaryrefslogtreecommitdiff
path: root/progs/xdemos/Makefile
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2008-07-30 07:56:42 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-07-30 07:56:42 -0700
commit3e8e292db0794a4d2dda1605f86e8f71dbf1d661 (patch)
tree084bc2e62e84afa95df02a4897cc7f0449164921 /progs/xdemos/Makefile
parentb068ab62a0433b6a92374c83f153b3c9ac4b4e5e (diff)
Always pass CFLAGS when compiling or linking demos
To ensure that the correct architecture flags are used, always pass the user's CFLAGS when compiling or linking the demos. Fixes #16860.
Diffstat (limited to 'progs/xdemos/Makefile')
-rw-r--r--progs/xdemos/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index c90159bd38..b259671210 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -67,10 +67,10 @@ clean:
# special cases
pbinfo: pbinfo.o pbutil.o
- $(CC) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
pbdemo: pbdemo.o pbutil.o
- $(CC) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
pbinfo.o: pbinfo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c
@@ -82,13 +82,13 @@ pbutil.o: pbutil.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c
glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
- $(CC) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
$(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
xrotfontdemo: xrotfontdemo.o xuserotfont.o
- $(CC) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
xuserotfont.o: xuserotfont.c xuserotfont.h
$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c