build: rename subdir.mak ---> library.mak
authorDiego Biurrun <diego@biurrun.de>
Tue, 13 Dec 2011 14:55:11 +0000 (15:55 +0100)
committerDiego Biurrun <diego@biurrun.de>
Tue, 13 Dec 2011 22:34:22 +0000 (23:34 +0100)
Makefile
library.mak [new file with mode: 0644]
subdir.mak [deleted file]

index 3809ece..19b8df4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ define DOSUBDIR
 $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 SUBDIR := $(1)/
 include $(SRC_PATH)/$(1)/Makefile
-include $(SRC_PATH)/subdir.mak
+include $(SRC_PATH)/library.mak
 endef
 
 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
diff --git a/library.mak b/library.mak
new file mode 100644 (file)
index 0000000..e269b50
--- /dev/null
@@ -0,0 +1,97 @@
+SRC_DIR := $(SRC_PATH)/lib$(NAME)
+
+include $(SRC_PATH)/common.mak
+
+LIBVERSION := $(lib$(NAME)_VERSION)
+LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
+INCINSTDIR := $(INCDIR)/lib$(NAME)
+THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
+
+all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
+all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
+
+$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
+       $(COMPILE_C)
+
+$(SUBDIR)%-test.o: $(SUBDIR)%.c
+       $(COMPILE_C)
+
+$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
+       $(YASMDEP) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
+       $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+
+$(OBJS) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
+$(TESTOBJS): CPPFLAGS += -DTEST
+
+$(SUBDIR)$(LIBNAME): $(OBJS)
+       $(RM) $@
+       $(AR) rc $@ $^ $(EXTRAOBJS)
+       $(RANLIB) $@
+
+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
+
+install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
+install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
+
+define RULES
+$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
+       $$(LD) $(LDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
+
+$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
+       $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
+
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
+       $(SLIB_CREATE_DEF_CMD)
+       $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
+       $(SLIB_EXTRA_CMD)
+
+clean::
+       $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+           $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \
+           $(HOSTOBJS) $(HOSTPROGS)
+
+distclean:: clean
+       $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \
+           $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))
+
+install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
+       $(Q)mkdir -p "$(SHLIBDIR)"
+       $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
+       $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F);)
+       $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
+       $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
+       $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")
+
+install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
+       $(Q)mkdir -p "$(LIBDIR)"
+       $$(INSTALL) -m 644 $$< "$(LIBDIR)"
+       $(LIB_INSTALL_EXTRA_CMD)
+
+install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
+       $(Q)mkdir -p "$(INCINSTDIR)"
+       $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
+
+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+       $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
+       $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
+
+uninstall-libs::
+       -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
+              "$(SHLIBDIR)/$(SLIBNAME)"            \
+              "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       -$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)"%)
+       -$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)"%)
+       -$(RM) "$(LIBDIR)/$(LIBNAME)"
+
+uninstall-headers::
+       $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS))
+       $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
+       -rmdir "$(INCDIR)"
+endef
+
+$(eval $(RULES))
+
+$(EXAMPLES) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
+
+examples: $(EXAMPLES)
+testprogs: $(TESTPROGS)
diff --git a/subdir.mak b/subdir.mak
deleted file mode 100644 (file)
index e269b50..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-SRC_DIR := $(SRC_PATH)/lib$(NAME)
-
-include $(SRC_PATH)/common.mak
-
-LIBVERSION := $(lib$(NAME)_VERSION)
-LIBMAJOR   := $(lib$(NAME)_VERSION_MAJOR)
-INCINSTDIR := $(INCDIR)/lib$(NAME)
-THIS_LIB   := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
-
-all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
-all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)
-
-$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
-       $(COMPILE_C)
-
-$(SUBDIR)%-test.o: $(SUBDIR)%.c
-       $(COMPILE_C)
-
-$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
-       $(YASMDEP) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
-       $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
-
-$(OBJS) $(SUBDIR)%.ho $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
-$(TESTOBJS): CPPFLAGS += -DTEST
-
-$(SUBDIR)$(LIBNAME): $(OBJS)
-       $(RM) $@
-       $(AR) rc $@ $^ $(EXTRAOBJS)
-       $(RANLIB) $@
-
-install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
-
-install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
-install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
-
-define RULES
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
-       $$(LD) $(LDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS)
-
-$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
-       $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
-
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
-       $(SLIB_CREATE_DEF_CMD)
-       $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
-       $(SLIB_EXTRA_CMD)
-
-clean::
-       $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-           $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \
-           $(HOSTOBJS) $(HOSTPROGS)
-
-distclean:: clean
-       $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \
-           $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))
-
-install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
-       $(Q)mkdir -p "$(SHLIBDIR)"
-       $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
-       $(Q)$(foreach F,$(SLIB_INSTALL_LINKS),cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F);)
-       $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
-       $(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
-       $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")
-
-install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
-       $(Q)mkdir -p "$(LIBDIR)"
-       $$(INSTALL) -m 644 $$< "$(LIBDIR)"
-       $(LIB_INSTALL_EXTRA_CMD)
-
-install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
-       $(Q)mkdir -p "$(INCINSTDIR)"
-       $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
-
-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
-       $(Q)mkdir -p "$(LIBDIR)/pkgconfig"
-       $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
-
-uninstall-libs::
-       -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
-              "$(SHLIBDIR)/$(SLIBNAME)"            \
-              "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-       -$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)"%)
-       -$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)"%)
-       -$(RM) "$(LIBDIR)/$(LIBNAME)"
-
-uninstall-headers::
-       $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS))
-       $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-       -rmdir "$(INCDIR)"
-endef
-
-$(eval $(RULES))
-
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
-
-examples: $(EXAMPLES)
-testprogs: $(TESTPROGS)