diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 01:48:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:22:01 +0100 |
| commit | 1fc74926a5d13261721e1c9962c48db00d214853 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /library.mak | |
| parent | 91253839e14cce9793ee93f184cef609ca8195d5 (diff) | |
| parent | b339182eba34f28de5f1a477cdd2c84f1ef35d90 (diff) | |
| download | ffmpeg-1fc74926a5d13261721e1c9962c48db00d214853.tar.gz | |
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/library.mak b/library.mak index 8bafb04717..cd39f11cfb 100644 --- a/library.mak +++ b/library.mak @@ -5,7 +5,6 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) LIBMINOR := $(lib$(NAME)_VERSION_MINOR) INCINSTDIR := $(INCDIR)/lib$(NAME) -LIB_EXAMPLES := $(LIB_EXAMPLES) $(EXAMPLES) INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) @@ -43,10 +42,10 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES -$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) -$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) +$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) +$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) -$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS) +$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS) $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) @@ -62,7 +61,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS) endif clean:: - $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ + $(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) distclean:: clean @@ -106,8 +105,7 @@ endef $(eval $(RULES)) -$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) -$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME) +$(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) +$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME) -examples: $(EXAMPLES) testprogs: $(TESTPROGS) |