Remove unnecessary get_bits.h #includes and add missing headers where needed.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index babcd10329d83c8f4375251dd5777a38c4cf1d39..832025d10cf649008b2aceef649bdd463df5c43d 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,101 +2,66 @@
 # common bits used by all libraries
 #
 
-VPATH = $(SRC_PATH_BARE)/lib$(NAME)
-SRC_DIR = "$(VPATH)"
+# first so "all" becomes default target
+all: all-yes
 
-CFLAGS   += $(CFLAGS-yes)
-OBJS     += $(OBJS-yes)
-ASM_OBJS += $(ASM_OBJS-yes)
-CPP_OBJS += $(CPP_OBJS-yes)
+include $(SRC_PATH)/arch.mak
 
-CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-          -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
-          -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+OBJS      += $(OBJS-yes)
+FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
+TESTPROGS += $(TESTPROGS-yes)
 
-SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
-OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
+LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))
+FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
 
-all: $(LIBNAME) $(SLIBNAME)
+OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))
+TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
+TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))
+HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)
+HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))
+TOOLS     += $(TOOLS-yes)
+TOOLOBJS  := $(TOOLS:%=tools/%.o)
+TOOLS     := $(TOOLS:%=tools/%$(EXESUF))
+HEADERS   += $(HEADERS-yes)
 
-$(LIBNAME): $(OBJS)
-       rm -f $@
-       $(AR) rc $@ $^ $(EXTRAOBJS)
-       $(RANLIB) $@
+PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(2)LIBNAME))
+DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib),$(CONFIG_SHARED:yes=S)))
+STATIC_DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
 
-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
-       $(LN_S) $^ $@
+SRC_DIR    := $(SRC_PATH)/lib$(NAME)
+ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
+SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
+SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
+HOBJS        = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o))
+checkheaders: $(HOBJS)
+.SECONDARY:   $(HOBJS:.o=.c)
 
-$(SLIBNAME_WITH_MAJOR): $(OBJS)
-       $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-       $(SLIB_EXTRA_CMD)
+alltools: $(TOOLS)
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+$(HOSTOBJS): %.o: %.c
+       $(COMPILE_HOSTC)
 
-%.o: %.S
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+$(HOSTPROGS): %$(HOSTEXESUF): %.o
+       $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
 
-%: %.o $(LIBNAME)
-       $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+$(OBJS):     | $(sort $(dir $(OBJS)))
+$(HOBJS):    | $(sort $(dir $(HOBJS)))
+$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
+$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
+$(TOOLOBJS): | tools
 
-%.ho: %.h
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $<
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
 
-ALLHEADERS = $(subst $(VPATH)/,,$(wildcard $(VPATH)/*.h))
-checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
-
-depend dep: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
+CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ver-sol2 *.gcno *.gcda
+DISTCLEANSUFFIXES = *.pc
+LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
 
+define RULES
 clean::
-       rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.def *.dll.a *.exp *.ho
-
-distclean: clean
-       rm -f .depend
-
-INSTALL_TARGETS-$(BUILD_SHARED) += install-lib-shared
-INSTALL_TARGETS-$(BUILD_STATIC) += install-lib-static
-
-install: install-libs install-headers
-
-install-libs: $(INSTALL_TARGETS-yes)
-
-install-lib-shared: $(SLIBNAME)
-       install -d "$(SHLIBDIR)"
-       install -m 755 $(SLIBNAME) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       cd "$(SHLIBDIR)" && \
-               $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
-       cd "$(SHLIBDIR)" && \
-               $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
-       $(SLIB_INSTALL_EXTRA_CMD)
-
-install-lib-static: $(LIBNAME)
-       install -d "$(LIBDIR)"
-       install -m 644 $(LIBNAME) "$(LIBDIR)"
-       $(LIB_INSTALL_EXTRA_CMD)
-
-install-headers:
-       install -d "$(INCDIR)"
-       install -d "$(LIBDIR)/pkgconfig"
-       install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
-       install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
-
-uninstall: uninstall-libs uninstall-headers
-
-uninstall-libs:
-       -rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
-              "$(SHLIBDIR)/$(SLIBNAME)"            \
-              "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       -$(SLIB_UNINSTALL_EXTRA_CMD)
-       -rm -f "$(LIBDIR)/$(LIBNAME)"
-
-uninstall-headers::
-       rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
-       rm -f "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
+       $(RM) $(HOSTPROGS)
+       $(RM) $(TOOLS)
+endef
 
-.PHONY: all depend dep clean distclean install* uninstall*
+$(eval $(RULES))
 
--include .depend
+-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d))