X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=subdir.mak;h=d89573904ebee5d347a000bd1bddf0e1e9f558af;hp=6384d8baf88350e144af03829ed53cd1ce7e63b6;hb=aafd659518356d1ae3624830a36816f154d94d83;hpb=71c61f62a3ca855062c832ec2ed27e331221af45 diff --git a/subdir.mak b/subdir.mak index 6384d8baf8..d89573904e 100644 --- a/subdir.mak +++ b/subdir.mak @@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak LIBVERSION := $(lib$(NAME)_VERSION) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) -ifeq ($(BUILD_STATIC),yes) +ifeq ($(CONFIG_STATIC),yes) all: $(SUBDIR)$(LIBNAME) install-libs: install-lib$(NAME)-static @@ -18,8 +18,31 @@ endif INCINSTDIR := $(INCDIR)/lib$(NAME) +THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) + define RULES -ifeq ($(BUILD_SHARED),yes) +$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o + $(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) + +$(SUBDIR)%-test.o: $(SUBDIR)%.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c -o $$@ $$^ + +$(SUBDIR)%-test.o: $(SUBDIR)%-test.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c -o $$@ $$^ + +$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm + $(YASM) $(YASMFLAGS) -I $$( $$(@:.o=.d) + $(YASM) $(YASMFLAGS) -I $$(