Mercurial > mplayer.hg
changeset 22654:e69efc71da7b
Merge CFLAGS and INCLUDES where appropriate.
| author | diego |
|---|---|
| date | Sat, 17 Mar 2007 01:18:03 +0000 |
| parents | e86fb87c952c |
| children | d03828cf3ae4 |
| files | drivers/Makefile |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/drivers/Makefile Sat Mar 17 01:12:18 2007 +0000 +++ b/drivers/Makefile Sat Mar 17 01:18:03 2007 +0000 @@ -6,16 +6,16 @@ ifneq (,$(findstring 2.6, $(VERSION))) MGA_VID_OBJ = mga_vid.ko -CFLAGS = -O2 -D__KERNEL__ -DMODULE -include $(KERNEL_INCLUDES)/config/modversions.h -Wall +CFLAGS = -O2 -D__KERNEL__ -DMODULE $(INCLUDES) -Wall -include $(KERNEL_INCLUDES)/config/modversions.h else MGA_VID_OBJ = mga_vid.o -CFLAGS = -O2 -D__KERNEL__ -DMODULE -include $(KERNEL_INCLUDES)/linux/modversions.h -Wall +CFLAGS = -O2 -D__KERNEL__ -DMODULE $(INCLUDES) -Wall -include $(KERNEL_INCLUDES)/linux/modversions.h endif all: $(MGA_VID_OBJ) mga_vid_test mga_vid.o: mga_vid.c mga_vid.h - $(CC) $(CFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -c $< mga_vid.ko: mga_vid.c mga_vid.h $(MAKE) -C $(KERNEL_DIR) SUBDIRS=$(PWD) modules @@ -24,7 +24,7 @@ $(CC) -O -o $@ $< tdfx_vid.o: tdfx_vid.c 3dfx.h - $(CC) $(CFLAGS) $(INCLUDES) -c $< + $(CC) $(CFLAGS) -c $< tdfx_vid_tst: tdfx_vid_tst.c $(CC) -O -o $@ $<