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

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index f06d3268a0990957b0d3b1faad870e29fdd97eb8..832025d10cf649008b2aceef649bdd463df5c43d 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -2,105 +2,66 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/lib$(NAME)
-VPATH = $(SRC_DIR)
+# first so "all" becomes default target
+all: all-yes
 
-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)
+include $(SRC_PATH)/arch.mak
 
-all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
+OBJS      += $(OBJS-yes)
+FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
+TESTPROGS += $(TESTPROGS-yes)
 
-$(LIB): $(STATIC_OBJS)
-       rm -f $@
-       $(AR) rc $@ $^ $(EXTRAOBJS)
-       $(RANLIB) $@
+LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))
+FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
 
-$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
-       ln -sf $^ $@
+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)
 
-$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
-       $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-ifeq ($(CONFIG_MINGW),yes)
-       -lib /machine:i386 /def:$(@:.dll=.def)
-endif
+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)))
 
-%.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+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)
 
-%.o: %.S
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+alltools: $(TOOLS)
 
-# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
-%.o: %.cpp
-       g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+$(HOSTOBJS): %.o: %.c
+       $(COMPILE_HOSTC)
 
-depend: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
+$(HOSTPROGS): %$(HOSTEXESUF): %.o
+       $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
 
-dep:   depend
+$(OBJS):     | $(sort $(dir $(OBJS)))
+$(HOBJS):    | $(sort $(dir $(HOBJS)))
+$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
+$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
+$(TOOLOBJS): | tools
 
+OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
+
+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 *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.lib *.def *.dll.a *.exp
-
-distclean: clean
-       rm -f .depend
-
-ifeq ($(BUILD_SHARED),yes)
-INSTLIBTARGETS += install-lib-shared
-endif
-ifeq ($(BUILD_STATIC),yes)
-INSTLIBTARGETS += install-lib-static
-endif
-
-install: install-libs install-headers
-
-install-libs: $(INSTLIBTARGETS)
-
-install-lib-shared: $(SLIBNAME)
-       install -d "$(libdir)"
-ifeq ($(CONFIG_MINGW),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
-else
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               $(shlibdir)/$(SLIBNAME_WITH_VERSION)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(shlibdir)/$(SLIBNAME_WITH_MAJOR)
-       ln -sf $(SLIBNAME_WITH_VERSION) \
-               $(shlibdir)/$(SLIBNAME)
-endif
-
-install-lib-static: $(LIB)
-       install -d "$(libdir)"
-       install -m 644 $(LIB) "$(libdir)"
-
-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:
-ifeq ($(CONFIG_MINGW),yes)
-       -rm -f $(prefix)/$(SLIBNAME)
-else
-       -rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
-             $(libdir)/$(SLIBNAME)            \
-             $(libdir)/$(SLIBNAME_WITH_VERSION)
-endif
-       -rm -f $(libdir)/$(LIB)
-
-uninstall-headers:
-       rm -f $(addprefix $(incdir)/,$(HEADERS))
-       rm -f $(libdir)/pkgconfig/lib$(NAME).pc
+       $(RM) $(HOSTPROGS)
+       $(RM) $(TOOLS)
+endef
 
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+$(eval $(RULES))
+
+-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d))