[x264-devel] [PATCH 6/9] build: Reorganize 'install-lib-shared'

Stephen Hutchinson qyot27 at gmail.com
Sat Apr 26 23:45:20 CEST 2014


*Use 'install-shared' as a subrecipe for 'install-lib-shared'
*Split 'lib-shared' into 'install-shared' and 'install-implib' so
 that automatic variables can be used. 'lib-shared' now only
 exists as the shortcut used by default
---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e7c9195..ee62f57 100644
--- a/Makefile
+++ b/Makefile
@@ -267,14 +267,20 @@ install-static: $(LIBX264)
 	$(INSTALL) -m 644 $< $(DESTDIR)$(libdir)
 	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
 
-install-lib-shared: lib-shared install-lib-dev
+install-lib-shared: install-lib-dev install-shared install-implib
+
+install-shared: $(SONAME)
 ifneq ($(IMPLIBNAME),)
 	$(INSTALL) -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
-	$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
+	$(INSTALL) -m 755 $< $(DESTDIR)$(bindir)
 else ifneq ($(SONAME),)
-	ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
-	$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(libdir)
+	ln -f -s $< $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
+	$(INSTALL) -m 755 $< $(DESTDIR)$(libdir)
+endif
+
+install-implib: $(IMPLIBNAME)
+ifneq ($(IMPLIBNAME),)
+	$(INSTALL) -m 644 $< $(DESTDIR)$(libdir)
 endif
 
 uninstall:
-- 
1.9.1



More information about the x264-devel mailing list