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

[Diego Biurrun]

On Thu, Aug 03, 2006 at 10:08:51PM +0100, M?ns Rullg?rd wrote:
> V?ctor Paesa <wzrlpy at arsystel.com> writes:
> 
> >> On Thu, Aug 03, 2006 at 07:51:16PM +0200, V?ctor Paesa wrote:
> >>>
> >>> The problem is that "ln" is emulated in MinGW by "cp", so you're
> >>> really attempting
> >>>
> >>> cp -f \
> >>> /home/wzrlpy/src/FFMpeg-20060802-5893/ffmpeg/libavutil/avutil-49.0.0.dll
> >>> \
> >>> "C:\Program Files/FFmpeg/lib/avutil-49.dll"
> >>>
> >>> and that fails, because there is no
> >>> /home/wzrlpy/src/FFMpeg-20060802-5893/ffmpeg/libavutil/avutil-49.0.0.dll
> >>
> >> OK, try the attached patch, please.
> >
> > Thanks, I'm a bit afar from my MinGW box now, I'll try tomorrow, but
> > I believe make launches a separate shell per each line, it should be more
> > alike to this:
> >
> > + ( cd "$(shlibdir)" ;\
>     ^ not needed       ^ should be &&
> > + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(SLIBNAME_WITH_VERSION) ;\
> > + ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) ;\
> > + ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME) )

.. next try ..

Diego
-------------- next part --------------
Index: common.mak
===================================================================
--- 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)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
@@ -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 $(libdir)/$(SLIBNAME_WITH_MAJOR) \
 	       $(libdir)/$(SLIBNAME)            \
 	       $(libdir)/$(SLIBNAME_WITH_VERSION)
-endif
 	-rm -f $(libdir)/$(LIB)
 
 uninstall-headers: