Browse Source

Make examples and test progs depend on libraries

Originally committed as revision 18297 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Måns Rullgård 17 years ago
parent
commit
bbba084b4f
2 changed files with 4 additions and 2 deletions
  1. +0
    -2
      libavformat/Makefile
  2. +4
    -0
      subdir.mak

+ 0
- 2
libavformat/Makefile View File

@@ -247,5 +247,3 @@ EXAMPLES = output
TESTPROGS = timefilter

include $(SUBDIR)../subdir.mak

$(SUBDIR)output-example$(EXESUF) $(SUBDIR)timefilter-test$(EXESUF): $(FF_DEP_LIBS)

+ 4
- 0
subdir.mak View File

@@ -18,6 +18,8 @@ endif

INCINSTDIR := $(INCDIR)/lib$(NAME)

THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)

define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
$(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS)
@@ -96,5 +98,7 @@ endef

$(eval $(RULES))

$(EXAMPLES) $(TESTPROGS): $(THIS_LIB) $(DEP_LIBS)

examples: $(EXAMPLES)
testprogs: $(TESTPROGS)

Loading…
Cancel
Save