1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- ./Makefile.orig 2011-11-30 03:57:20.000000000 -0500
+++ ./Makefile 2012-10-14 20:42:11.000000000 -0400
@@ -96,7 +96,7 @@
$(wavpack-objs): CFLAGS += $(WAVPACK_CFLAGS)
$(mp4-objs): CFLAGS += $(MP4_CFLAGS)
$(aac-objs): CFLAGS += $(AAC_CFLAGS)
-$(ffmpeg-objs): CFLAGS += $(FFMPEG_CFLAGS)
+$(ffmpeg-objs): CFLAGS := $(FFMPEG_CFLAGS) $(CFLAGS)
flac.so: $(flac-objs) $(libcmus-y)
$(call cmd,ld_dl,$(FLAC_LIBS))
@@ -200,10 +200,10 @@
$(call cmd,ttman)
Doc/ttman.o: Doc/ttman.c
- $(call cmd,hostcc,)
+ $(call cmd,cc,)
Doc/ttman: Doc/ttman.o
- $(call cmd,hostld,)
+ $(call cmd,ld,)
quiet_cmd_ttman = MAN $@
cmd_ttman = Doc/ttman $< $@
|
