summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 18:25:34 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 18:25:34 +0300
commit7795726e0f8c70edd6ecde7fd2137214af302f4f (patch)
tree87a087e69a0e2912183736de409676f824fb2248 /Makefile
parentba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff)
parente16f02fe4001f3056b8efd1a099a563569b73f5d (diff)
downloadmpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2
mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz
Merge svn changes up to r31033
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index c1d8b7f2c3..47b0bb4106 100644
--- a/Makefile
+++ b/Makefile
@@ -750,19 +750,19 @@ ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
all: $(ALL_PRG-yes) locales
+%.ho: %.h
+ $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
+
+%.o: %.S
+ $(CC) $(CFLAGS) -c -o $@ $<
+
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ -MD -MP -MF $*.d $<
+ $(CC) $(CFLAGS) -c -o $@ $<
%.o: %.cpp
- $(CXX) $(CXXFLAGS) -c -o $@ -MD -MP -MF $*.d $<
+ $(CC) $(CXXFLAGS) -c -o $@ $<
%.o: %.m
- $(CC) $(CFLAGS) -c -o $@ -MD -MP -MF $*.d $<
-
-%.ho: %.h
- $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
-
-%.o: %.S
$(CC) $(CFLAGS) -c -o $@ $<
%-rc.o: %.rc