[email protected] writes: > From: Luca Barbato <[email protected]> > > Use cp instead ln and remove the unused fullversion library. > --- > configure | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/configure b/configure > index 0f8b849..f5391cb 100755 > --- a/configure > +++ b/configure > @@ -2414,6 +2414,7 @@ case $target_os in > LIBTARGET=arm-wince > fi > shlibdir_default="$bindir_default" > + ln_s="cp -f" > SLIBPREF="" > SLIBSUF=".dll" > > SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' > @@ -2422,7 +2423,9 @@ case $target_os in > SLIB_INSTALL_EXTRA_CMD='-install -m 644 > $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) > "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \ > install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) > "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \ > install -d "$(LIBDIR)"; \ > - install -m 644 $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) > "$(LIBDIR)/lib$(SLIBNAME:$(SLIBSUF)=.dll.a)"' > + install -m 644 $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) > "$(LIBDIR)/lib$(SLIBNAME:$(SLIBSUF)=.dll.a)"; \ > + install -m 644 $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.def) > "$(LIBDIR)/lib$(SLIBNAME:$(SLIBSUF)=.def)"; \ > + rm -f $(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)' > SLIB_UNINSTALL_EXTRA_CMD='rm -f > "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"' > SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) > -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) > -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' > objformat="win32" > --
This is getting messy quickly. Let's clean it up properly instead. I was thinking about some changes that would make the installation more flexible: 1. Add a variable SLIB_INSTALL_NAME, and do something like this to subdir.mak: - $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" + $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" 2. Add a variable SLIB_INSTALL_LINKS listing symlinks to be created for the installed libs, and replace the two LN_S commands in the install-shared target with a for loop over this. By default set this variable to "$(SLIBNAME_WITH_MAJOR) $(SLIBNAME)". 3. Possibly add a variable for additional files to be installed. This could list the .lib, .def and other auxiliary files needed on various systems. With these changes, SLIB_INSTALL_EXTRA_CMD would be largely obsoleted. -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
