diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-09 12:38:33 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-09 12:38:33 +0000 |
| commit | 0b1b4814a8628f5c1d66fe3525bc0ff3977cec55 (patch) | |
| tree | 80307080d4dad2ab51995469ce561256c37f543d /common.mak | |
| parent | e6f301c8ae5b66a86ecc04cae0a0180c1b161e59 (diff) | |
| download | mpv-0b1b4814a8628f5c1d66fe3525bc0ff3977cec55.tar.bz2 mpv-0b1b4814a8628f5c1d66fe3525bc0ff3977cec55.tar.xz | |
Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26703 b3059339-0415-0410-9bf9-f77b7e298cf2
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 1fbdf2b489..88a816efed 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) \ - $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS) + -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) $(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) |