diff options
| author | Brian Paul <brianp@vmware.com> | 2010-02-24 12:03:51 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-02-24 12:03:59 -0700 |
| commit | ccd78fed880c4c8f1fccf1d10fc46442fa146359 (patch) | |
| tree | 95984ff6d25b637f3bd370b2b9fe9660aba4270f | |
| parent | 51b799288a405be3f4cdbfc7221221399512992a (diff) | |
gallium: remove $(DEFINES) from cc/c++ command lines
The $(DEFINES) is already in $(CFLAG)S and (CXXFLAGS).
This prevents all the -D args appearing twice in the compilation commands.
| -rw-r--r-- | src/gallium/Makefile.template | 8 | ||||
| -rw-r--r-- | src/gallium/winsys/xlib/Makefile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template index 5d9d2db786..3274c8e0c3 100644 --- a/src/gallium/Makefile.template +++ b/src/gallium/Makefile.template @@ -54,16 +54,16 @@ install: ##### RULES ##### %.s: %.c - $(CC) -S $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ + $(CC) -S $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ %.o: %.c - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ + $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ %.o: %.cpp - $(CXX) -c $(INCLUDES) $(DEFINES) $(CXXFLAGS) $(LIBRARY_DEFINES) $< -o $@ + $(CXX) -c $(INCLUDES) $(CXXFLAGS) $(LIBRARY_DEFINES) $< -o $@ %.o: %.S - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ + $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ sinclude depend diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 9482e8f9b1..824c666ae3 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -50,10 +50,10 @@ LIBS = \ .SUFFIXES : .cpp .c.o: - $(CC) -c $(INCLUDE_DIRS) $(DEFINES) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ .cpp.o: - $(CXX) -c $(INCLUDE_DIRS) $(DEFINES) $(CXXFLAGS) $< -o $@ + $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@ |