[Ffmpeg-devel] Re: [RFC] ffmpeg-windows mailinglist?

[Diego Biurrun]

On Thu, Aug 03, 2006 at 11:12:22PM +0100, M?ns Rullg?rd wrote:
> Diego Biurrun <diego at biurrun.de> writes:
> 
> > --- common.mak	(revision 5921)
> > +++ common.mak	(working copy)
> > @@ -5,7 +5,7 @@
> >  SRC_DIR = $(SRC_PATH)/lib$(NAME)
> >  VPATH = $(SRC_DIR)
> >
> > -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
> > +SRCS := $(OBJS:.o=.c) $(STATIC_OBJS:.o=.c) $(SHARED_OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
> 
> This looks unrelated.

It is.  Here is a patch without that hunk, updated for HEAD.

Diego
-------------- next part --------------
Index: common.mak
===================================================================
--- common.mak	(revision 5927)
+++ common.mak	(working copy)
@@ -59,16 +59,10 @@
 
 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
+		"$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+	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 +77,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: