diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-15 15:50:29 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-02-16 21:37:21 +0100 |
| commit | b339182eba34f28de5f1a477cdd2c84f1ef35d90 (patch) | |
| tree | e284b1348b4775bef096a807277606ffca6b325b /library.mak | |
| parent | 77fbc032655534ab82627c982192323f2e0d5f18 (diff) | |
| download | ffmpeg-b339182eba34f28de5f1a477cdd2c84f1ef35d90.tar.gz | |
Move all example programs to doc/examples
Also drop support for building examples in library directories.
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 800c5e07f3..af33206434 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) @@ -58,7 +57,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) $(SLIB_EXTRA_CMD) clean:: - $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ + $(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) distclean:: clean @@ -101,8 +100,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) |