X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=subdir.mak;h=36a40d375a5da6045fb6f8419381454c289b2f2c;hb=66b6c7458ecf2886f5cae5ad8287e37144ab50ac;hp=9d818885c8ffa82182dbcb6210fb4ebd29996886;hpb=63611f31e89c1f1dd19f325ec20ca442841e084b;p=ffmpeg

diff --git a/subdir.mak b/subdir.mak
index 9d818885c8f..36a40d375a5 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -4,51 +4,38 @@ include $(SUBDIR)../common.mak
 
 LIBVERSION := $(lib$(NAME)_VERSION)
 LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
+INCINSTDIR := $(INCDIR)/lib$(NAME)
+THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
 
-ifdef CONFIG_STATIC
-all: $(SUBDIR)$(LIBNAME)
+all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
+all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
 
-install-libs: install-lib$(NAME)-static
-install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
+
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $(CC_O) $^
+
+$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
+	$(YASMDEP) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
+	$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+
+$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@
 	$(AR) rc $@ $^ $(EXTRAOBJS)
 	$(RANLIB) $@
-endif
 
-INCINSTDIR := $(INCDIR)/lib$(NAME)
+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
 
-THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
+install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
+install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
 
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
 	$$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
-$(SUBDIR)%-test.o: $(SUBDIR)%.c
-	$$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
-
-$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
-	$$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
-
-$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
-	$$(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
-	$$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
-
-clean::
-	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-	    $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
-	    $(HOSTOBJS) $(HOSTPROGS)
-
-distclean:: clean
-	$(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
-            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
-
-ifdef CONFIG_SHARED
-all: $(SUBDIR)$(SLIBNAME)
-
-install-libs: install-lib$(NAME)-shared
-
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
@@ -60,7 +47,15 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
 ifdef SUBDIR
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 endif
-endif
+
+clean::
+	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+	    $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
+	    $(HOSTOBJS) $(HOSTPROGS)
+
+distclean:: clean
+	$(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 	$(Q)mkdir -p "$(SHLIBDIR)"
@@ -70,15 +65,12 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 		$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
 	$(Q)cd "$(SHLIBDIR)" && \
 		$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
-	$$(SLIB_INSTALL_EXTRA_CMD)
-
-install-lib$(NAME)-static: MSG = $(LIBDIR)/$(LIBNAME)
-install-lib$(NAME)-shared: MSG = $(LIBDIR)/$(SLIBNAME)
+	$(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
 	$(Q)mkdir -p "$(LIBDIR)"
 	$$(INSTALL) -m 644 $$< "$(LIBDIR)"
-	$$(LIB_INSTALL_EXTRA_CMD)
+	$(LIB_INSTALL_EXTRA_CMD)
 
 install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
 	$(Q)mkdir -p "$(INCINSTDIR)"