cosmetics: reindent after last commit

[frescor/ffmpeg.git] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index 6b098cdb67825f95ecf90d1e37bc2c0c9d65e8bd..7148ce6fcde23fc5327dfe3c60473593e176a8a8 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -18,9 +18,11 @@ endif
 
 INCINSTDIR := $(INCDIR)/lib$(NAME)
 
+THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
+
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
-       $(CC) $(FFLDFLAGS) -o $$@ $$^ $(SUBDIR)$(LIBNAME) $(FFEXTRALIBS)
+       $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)%-test.o: $(SUBDIR)%.c
        $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
@@ -96,5 +98,7 @@ endef
 
 $(eval $(RULES))
 
+$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)
+
 examples: $(EXAMPLES)
 testprogs: $(TESTPROGS)