diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-06 17:14:16 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-06 17:14:16 +0000 |
| commit | 34512bca0e0b987dc3abd5a79f232f7d33194f4c (patch) | |
| tree | 731629b5246b1c6e8170b5905eff193c047e93cd | |
| parent | fd676deb96b2cc668df37ef5118cabfa75142064 (diff) | |
| download | ffmpeg-34512bca0e0b987dc3abd5a79f232f7d33194f4c.tar.gz | |
Split install-headers target and simplify rules
Originally committed as revision 22243 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | subdir.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subdir.mak b/subdir.mak index 872793488d..9302722eae 100644 --- a/subdir.mak +++ b/subdir.mak @@ -9,6 +9,7 @@ ifdef CONFIG_STATIC all: $(SUBDIR)$(LIBNAME) install-libs: install-lib$(NAME)-static +install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig $(SUBDIR)$(LIBNAME): $(OBJS) $(RM) $@ @@ -76,14 +77,13 @@ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) $$(INSTALL) -m 644 $$< "$(LIBDIR)" $(LIB_INSTALL_EXTRA_CMD) -install-headers:: +install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS)) mkdir -p "$(INCINSTDIR)" + $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" + +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc mkdir -p "$(LIBDIR)/pkgconfig" - $$(INSTALL) -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)" -ifdef BUILT_HEADERS - $$(INSTALL) -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)" -endif - $$(INSTALL) -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig" + $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" uninstall-libs:: -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ |