Commit 34512bca authored by Måns Rullgård's avatar Måns Rullgård

Split install-headers target and simplify rules

Originally committed as revision 22243 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fd676deb
...@@ -9,6 +9,7 @@ ifdef CONFIG_STATIC ...@@ -9,6 +9,7 @@ ifdef CONFIG_STATIC
all: $(SUBDIR)$(LIBNAME) all: $(SUBDIR)$(LIBNAME)
install-libs: install-lib$(NAME)-static install-libs: install-lib$(NAME)-static
install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
$(SUBDIR)$(LIBNAME): $(OBJS) $(SUBDIR)$(LIBNAME): $(OBJS)
$(RM) $@ $(RM) $@
...@@ -76,14 +77,13 @@ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) ...@@ -76,14 +77,13 @@ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
$$(INSTALL) -m 644 $$< "$(LIBDIR)" $$(INSTALL) -m 644 $$< "$(LIBDIR)"
$(LIB_INSTALL_EXTRA_CMD) $(LIB_INSTALL_EXTRA_CMD)
install-headers:: install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
mkdir -p "$(INCINSTDIR)" mkdir -p "$(INCINSTDIR)"
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
mkdir -p "$(LIBDIR)/pkgconfig" mkdir -p "$(LIBDIR)/pkgconfig"
$$(INSTALL) -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
ifdef BUILT_HEADERS
$$(INSTALL) -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
endif
$$(INSTALL) -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
uninstall-libs:: uninstall-libs::
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment