Makefile.omk sucks in config generated by config4omk.

[frescor/ffmpeg.git] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index 7343f548e045b3c6ef79b08e0aedb0a70cc9e75a..332816e2b70cc0634efa08d0acbc99ea1ce36e85 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -22,7 +22,7 @@ THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME)
 
 define RULES
 $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
-       $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS)
+       $(CC) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
 
 $(SUBDIR)%-test.o: $(SUBDIR)%.c
        $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
@@ -37,7 +37,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
 
 clean::
-       rm -f $(EXAMPLES) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+       rm -f $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
            $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 distclean:: clean