[Ffmpeg-cvslog] r5930 - trunk/common.mak

diego subversion
Fri Aug 4 12:23:06 CEST 2006


Author: diego
Date: Fri Aug  4 12:23:06 2006
New Revision: 5930

Modified:
   trunk/common.mak

Log:
Remove MinGW specialcasing and make shared library installation compatible
with MinGW where ln is emulated by cp.


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Fri Aug  4 12:23:06 2006
@@ -59,16 +59,12 @@
 
 install-lib-shared: $(SLIBNAME)
 	install -d "$(shlibdir)"
-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
+	cd "$(shlibdir)" && \
+		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
+	cd "$(shlibdir)" && \
+		ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
 
 install-lib-static: $(LIB)
 	install -d "$(libdir)"
@@ -83,13 +79,9 @@
 uninstall: uninstall-libs uninstall-headers
 
 uninstall-libs:
-ifeq ($(CONFIG_MINGW),yes)
-	-rm -f "$(prefix)/$(SLIBNAME)"
-else
 	-rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \
 	       "$(shlibdir)/$(SLIBNAME)"            \
 	       "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
-endif
 	-rm -f "$(libdir)/$(LIB)"
 
 uninstall-headers:




More information about the ffmpeg-cvslog mailing list