Alexandre Julliard : makefiles: Generate rules for installing libwine.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 12 09:58:28 CST 2015
Module: wine
Branch: master
Commit: fd88ff95a4810602c9c13476f7a5178e587b1b3c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd88ff95a4810602c9c13476f7a5178e587b1b3c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Nov 12 23:01:28 2015 +0900
makefiles: Generate rules for installing libwine.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 37 +++++++------------------------------
configure.ac | 37 +++++++------------------------------
tools/makedep.c | 4 ++++
3 files changed, 18 insertions(+), 60 deletions(-)
diff --git a/configure b/configure
index 1e0d0a3..e83ca7b 100755
--- a/configure
+++ b/configure
@@ -7986,6 +7986,7 @@ fi
LIBWINE_RULES="
SHAREDLIB = libwine.dll
+INSTALL_LIB = libwine.dll
libwine_LDFLAGS = -shared \$(srcdir)/wine.def
EXTRA_TARGETS = libwine.a
@@ -7997,14 +7998,11 @@ libwine.a: \$(srcdir)/wine.def
libwine.dll: \$(srcdir)/wine.def
-install install-lib:: libwine.dll
- \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll
-
install install-dev:: libwine.a
\$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a
uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.a libwine.dll
+ \$(RM) \$(DESTDIR)\$(libdir)/libwine.a
"
;;
@@ -8244,17 +8242,9 @@ fi
LIBWINE_RULES="
SHAREDLIB = libwine.$libwine_version.dylib
+INSTALL_LIB = libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib
+INSTALL_DEV = libwine.dylib
libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath, at loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version
-
-install install-lib:: libwine.$libwine_version.dylib
- \$(INSTALL_PROGRAM) libwine.$libwine_version.dylib \$(DESTDIR)\$(libdir)/libwine.$libwine_version.dylib
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.$libwine_soversion.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib
-
-install install-dev::
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.dylib
-
-uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib libwine.$libwine_soversion.dylib libwine.$libwine_version.dylib
"
@@ -8410,13 +8400,8 @@ fi
LIBWINE_RULES="
SHAREDLIB = libwine.so
+INSTALL_LIB = libwine.so
libwine_LDFLAGS = -shared
-
-install install-lib:: libwine.so
- \$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so
-
-uninstall::
- \$(RM) \$(DESTDIR)\$(libdir)/libwine.so
"
@@ -8779,19 +8764,11 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; }
fi
LIBWINE_RULES="
SHAREDLIB = libwine.so.$libwine_version
+INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion
+INSTALL_DEV = libwine.so
libwine_LDFLAGS = $shared_ldflags
libwine.so.$libwine_version: \$(srcdir)/wine.map
-
-install install-lib:: libwine.so.$libwine_version
- \$(INSTALL_PROGRAM) libwine.so.$libwine_version \$(DESTDIR)\$(libdir)/libwine.so.$libwine_version
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.$libwine_soversion && \$(LN_S) libwine.so.$libwine_version libwine.so.$libwine_soversion
-
-install install-dev::
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.$libwine_version libwine.so
-
-uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so libwine.so.$libwine_soversion libwine.so.$libwine_version
"
diff --git a/configure.ac b/configure.ac
index 6779d30..372d06e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,6 +719,7 @@ case $host_os in
AC_SUBST(LIBWINE_RULES,["
SHAREDLIB = libwine.dll
+INSTALL_LIB = libwine.dll
libwine_LDFLAGS = -shared \$(srcdir)/wine.def
EXTRA_TARGETS = libwine.a
@@ -730,14 +731,11 @@ libwine.a: \$(srcdir)/wine.def
libwine.dll: \$(srcdir)/wine.def
-install install-lib:: libwine.dll
- \$(INSTALL_DATA) libwine.dll \$(DESTDIR)\$(libdir)/libwine.dll
-
install install-dev:: libwine.a
\$(INSTALL_DATA) libwine.a \$(DESTDIR)\$(libdir)/libwine.a
uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.a libwine.dll
+ \$(RM) \$(DESTDIR)\$(libdir)/libwine.a
"])
;;
@@ -858,17 +856,9 @@ uninstall::
AC_SUBST(LIBWINE_RULES,["
SHAREDLIB = libwine.$libwine_version.dylib
+INSTALL_LIB = libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib
+INSTALL_DEV = libwine.dylib
libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath, at loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version
-
-install install-lib:: libwine.$libwine_version.dylib
- \$(INSTALL_PROGRAM) libwine.$libwine_version.dylib \$(DESTDIR)\$(libdir)/libwine.$libwine_version.dylib
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.$libwine_soversion.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.$libwine_soversion.dylib
-
-install install-dev::
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib && \$(LN_S) libwine.$libwine_version.dylib libwine.dylib
-
-uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.dylib libwine.$libwine_soversion.dylib libwine.$libwine_version.dylib
"])
AS_VAR_APPEND([LOADER_RULES],["
@@ -903,13 +893,8 @@ $wine_binary $wine_binary-installed: wine_info.plist
AC_SUBST(LIBWINE_RULES,["
SHAREDLIB = libwine.so
+INSTALL_LIB = libwine.so
libwine_LDFLAGS = -shared
-
-install install-lib:: libwine.so
- \$(INSTALL_PROGRAM) libwine.so \$(DESTDIR)\$(libdir)/libwine.so
-
-uninstall::
- \$(RM) \$(DESTDIR)\$(libdir)/libwine.so
"])
AS_VAR_APPEND([LOADER_RULES],["
@@ -978,19 +963,11 @@ ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
fi
AC_SUBST(LIBWINE_RULES,["
SHAREDLIB = libwine.so.$libwine_version
+INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion
+INSTALL_DEV = libwine.so
libwine_LDFLAGS = $shared_ldflags
libwine.so.$libwine_version: \$(srcdir)/wine.map
-
-install install-lib:: libwine.so.$libwine_version
- \$(INSTALL_PROGRAM) libwine.so.$libwine_version \$(DESTDIR)\$(libdir)/libwine.so.$libwine_version
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so.$libwine_soversion && \$(LN_S) libwine.so.$libwine_version libwine.so.$libwine_soversion
-
-install install-dev::
- cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so && \$(LN_S) libwine.so.$libwine_version libwine.so
-
-uninstall::
- -cd \$(DESTDIR)\$(libdir) && \$(RM) libwine.so libwine.so.$libwine_soversion libwine.so.$libwine_version
"])
AS_VAR_APPEND([LOADER_RULES],["
diff --git a/tools/makedep.c b/tools/makedep.c
index c73204c2..f037d6b 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2600,10 +2600,14 @@ static struct strarray output_sources( const struct makefile *make, struct strar
output_filenames( all_libs );
output_filename( "$(LDFLAGS)" );
output( "\n" );
+ add_install_rule( make, install_rules, make->sharedlib, make->sharedlib,
+ strmake( "p$(libdir)/%s", make->sharedlib ));
for (i = 1; i < names.count; i++)
{
output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] ));
output( "\trm -f $@ && $(LN_S) %s $@\n", names.str[i-1] );
+ add_install_rule( make, install_rules, names.str[i], names.str[i-1],
+ strmake( "y$(libdir)/%s", names.str[i] ));
}
strarray_addall( &all_targets, names );
}
More information about the wine-cvs
mailing list