diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-17 20:50:23 +0200 |
| commit | 1715c2a33632b333f8e8e581ef23ea5fe0234edd (patch) | |
| tree | f2f9ddca0f4940edd845d71a5bfd74c8a09ba633 /common.mak | |
| parent | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (diff) | |
| parent | 409bb1c5daba69aac788ce5065d05b8ea8441cfd (diff) | |
| download | mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.bz2 mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.xz | |
Merge svn changes up to r27949
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/common.mak b/common.mak index e5770be94f..4d92999542 100644 --- a/common.mak +++ b/common.mak @@ -8,11 +8,18 @@ ifndef SUBDIR vpath %.c $(SRC_DIR) vpath %.h $(SRC_DIR) vpath %.S $(SRC_DIR) +vpath %.asm $(SRC_DIR) + +ifeq ($(SRC_DIR),$(SRC_PATH_BARE)) +BUILD_ROOT_REL = . +else +BUILD_ROOT_REL = .. +endif 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 $(OPTFLAGS) +CFLAGS := -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -I$(BUILD_ROOT_REL) -I$(SRC_PATH) -I$(SRC_PATH)/ffmpeg $(OPTFLAGS) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -32,8 +39,18 @@ CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ %.d: %.cpp $(DEPEND_CMD) > $@ +%.o: %.d + %$(EXESUF): %.c +SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries +ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES)) +$(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES) +endif + +$(BUILD_ROOT_REL)/version.h: + $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION) + install: install-libs install-headers uninstall: uninstall-libs uninstall-headers @@ -43,18 +60,12 @@ endif CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) -ASM_OBJS += $(ASM_OBJS-yes) -CPP_OBJS += $(CPP_OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) TESTS += $(TESTS-yes) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPP_OBJS:.o=.cpp) -OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS) - -SRCS := $(addprefix $(SUBDIR),$(SRCS)) OBJS := $(addprefix $(SUBDIR),$(OBJS)) TESTS := $(addprefix $(SUBDIR),$(TESTS)) @@ -68,7 +79,7 @@ depend dep: $(DEPS) CLEANSUFFIXES = *.o *~ *.ho LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map -DISTCLEANSUFFIXES = *.d +DISTCLEANSUFFIXES = *.d *.pc define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o @@ -80,6 +91,12 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c $(SUBDIR)%-test.o: $(SUBDIR)%-test.c $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ +$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm + $(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$< + +$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm + $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@ + clean:: rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) |