diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /common.mak | |
parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'common.mak')
-rw-r--r-- | common.mak | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/common.mak b/common.mak index 1d47b4a9bf..e5770be94f 100644 --- a/common.mak +++ b/common.mak @@ -12,8 +12,7 @@ vpath %.S $(SRC_DIR) ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/ffmpeg\ - $(addprefix -I$(SRC_PATH)/ffmpeg/lib,$(ALLFFLIBS)) $(OPTFLAGS) + -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/ffmpeg $(OPTFLAGS) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -33,6 +32,8 @@ CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ %.d: %.cpp $(DEPEND_CMD) > $@ +%$(EXESUF): %.c + install: install-libs install-headers uninstall: uninstall-libs uninstall-headers @@ -70,11 +71,14 @@ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map DISTCLEANSUFFIXES = *.d define RULES -$(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME) - $(CC) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) +$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o + $(CC) $(FFLDFLAGS) -o $$@ $$^ $(SUBDIR)$(LIBNAME) $(FFEXTRALIBS) + +$(SUBDIR)%-test.o: $(SUBDIR)%.c + $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ -$(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME) - $(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS) +$(SUBDIR)%-test.o: $(SUBDIR)%-test.c + $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ clean:: rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ @@ -87,9 +91,6 @@ endef $(eval $(RULES)) -# Clear DIRS variable so that it is not used in other subdirectories. -DIRS = - tests: $(TESTS) -include $(DEPS) |