FLAT objects cannot have multiple sections, so using the L1 attributes breaks

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index e93ded05642ee0c12d7e0a32de73cf7816e0aec1..b809748f3e46f44597b8faad1ec2dd37992274b8 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
 
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
-STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
-SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
-all: $(LIB) $(SLIBNAME)
+all: $(LIBNAME) $(SLIBNAME)
 
-$(LIB): $(STATIC_OBJS)
+$(LIBNAME): $(OBJS)
        rm -f $@
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
@@ -29,7 +27,8 @@ $(LIB): $(STATIC_OBJS)
 $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
        $(LN_S) $^ $@
 
-$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
+$(SLIBNAME_WITH_MAJOR): $(OBJS)
+       $(SLIB_CREATE_DEF_CMD)
        $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
        $(SLIB_EXTRA_CMD)
 
@@ -39,7 +38,7 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
-%: %.o $(LIB)
+%: %.o $(LIBNAME)
        $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 
 %.ho: %.h
@@ -53,21 +52,17 @@ depend dep: $(SRCS)
 
 clean::
        rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.def *.dll.a *.exp *.ho
+             *.def *.dll.a *.exp *.ho *.map $(TESTS)
 
 distclean: clean
        rm -f .depend
 
-ifeq ($(BUILD_SHARED),yes)
-INSTLIBTARGETS += install-lib-shared
-endif
-ifeq ($(BUILD_STATIC),yes)
-INSTLIBTARGETS += install-lib-static
-endif
+INSTALL_TARGETS-$(BUILD_SHARED) += install-lib-shared
+INSTALL_TARGETS-$(BUILD_STATIC) += install-lib-static
 
 install: install-libs install-headers
 
-install-libs: $(INSTLIBTARGETS)
+install-libs: $(INSTALL_TARGETS-yes)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(SHLIBDIR)"
@@ -79,9 +74,9 @@ install-lib-shared: $(SLIBNAME)
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
        $(SLIB_INSTALL_EXTRA_CMD)
 
-install-lib-static: $(LIB)
+install-lib-static: $(LIBNAME)
        install -d "$(LIBDIR)"
-       install -m 644 $(LIB) "$(LIBDIR)"
+       install -m 644 $(LIBNAME) "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
@@ -97,12 +92,17 @@ uninstall-libs:
               "$(SHLIBDIR)/$(SLIBNAME)"            \
               "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        -$(SLIB_UNINSTALL_EXTRA_CMD)
-       -rm -f "$(LIBDIR)/$(LIB)"
+       -rm -f "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
        rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
        rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
 
-.PHONY: all depend dep clean distclean install* uninstall*
+tests: $(TESTS)
+
+%-test$(EXESUF): %.c $(LIBNAME)
+       $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
+
+.PHONY: all depend dep clean distclean install* uninstall* tests
 
 -include .depend