blob: c988b9658a0b8dd91a1cbc2e7feaebe53797dff5 (
plain) (
blame)
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 2012-11-11 17:40:55.000000000 +0100
+++ Makefile 2012-11-11 17:42:25.000000000 +0100
@@ -105,7 +105,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)
$(cue-objs): CFLAGS += $(CUE_CFLAGS)
cdio.so: $(cdio-objs) $(libcmus-y)
@@ -216,10 +216,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 $< $@
|
