diff --git a/libs/.gitignore b/libs/.gitignore index 966ebc6798d..ff27f54c4da 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -1,2 +1,2 @@ *.dylib -*.so.1 +*.so.* diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 3f8cf3e08b0..fff6d4cece2 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -9,6 +9,7 @@ VERSCRIPT = $(SRCDIR)/wine.map EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" +VERSION = 1.0 SOVERSION = 1 SONAME = libwine.so.$(SOVERSION) DYNAME = libwine.$(SOVERSION).dylib @@ -113,9 +114,12 @@ config.o: config.c $(RELPATH) # Linking rules -libwine.so.$(SOVERSION): $(OBJS) $(VERSCRIPT) Makefile.in +libwine.so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ +libwine.so.$(SOVERSION): libwine.so.$(VERSION) + $(RM) $@ && $(LN_S) libwine.so.$(VERSION) $@ + libwine.so: libwine.so.$(SOVERSION) $(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@ @@ -125,9 +129,12 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -libwine.$(SOVERSION).dylib: $(OBJS) $(RELPATH) Makefile.in +libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ +libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib + $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ + libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@ @@ -135,21 +142,23 @@ libwine.dylib: libwine.$(SOVERSION).dylib .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib -install-lib-so: libwine.so.$(SOVERSION) dummy +install-lib-so: libwine.so.$(VERSION) dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libwine.so.$(SOVERSION) $(DESTDIR)$(libdir)/libwine.so.$(SOVERSION) + $(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) + cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION) install-lib-dll: libwine.dll dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll -install-lib-dylib: libwine.$(SOVERSION).dylib dummy +install-lib-dylib: libwine.$(VERSION).dylib dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libwine.$(SOVERSION).dylib $(DESTDIR)$(libdir)/libwine.$(SOVERSION).dylib + $(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib + cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib install-dev-so: dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(SOVERSION) libwine.so + cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(VERSION) libwine.so install-dev-dll: libwine.a dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -157,16 +166,17 @@ install-dev-dll: libwine.a dummy install-dev-dylib: dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(SOVERSION).dylib libwine.dylib + cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(VERSION).dylib libwine.dylib install install-lib:: $(LIBEXT:%=install-lib-%) install install-dev:: $(LIBEXT:%=install-dev-%) uninstall:: - -cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(SOVERSION) libwine.dylib libwine.$(SOVERSION).dylib + -cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(VERSION) \ + libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib clean:: - $(RM) libwine.so.$(SOVERSION) + $(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath