Alexandre Julliard : makefiles: Get rid of the DLLPREFIX variable.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 9 08:34:17 CST 2015
Module: wine
Branch: master
Commit: 1fa7710ff92dd9555b2b4753e22ce5fc7629cab9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa7710ff92dd9555b2b4753e22ce5fc7629cab9
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 9 11:37:51 2015 +0900
makefiles: Get rid of the DLLPREFIX variable.
Android libraries will be handled differently.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
Makefile.in | 1 -
aclocal.m4 | 8 ++++----
configure | 12 ++++--------
configure.ac | 2 --
dlls/dbghelp/Makefile.in | 2 +-
dlls/dbghelp/module.c | 11 -----------
libs/wine/Makefile.in | 1 -
libs/wine/config.c | 3 +--
libs/wine/loader.c | 7 ++-----
tools/makedep.c | 3 ---
10 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index fc37ae2..4c41640 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,6 @@ LIBS = @LIBS@
BISON = @BISON@
FLEX = @FLEX@
EXEEXT = @EXEEXT@
-DLLPREFIX = @DLLPREFIX@
TOOLSEXT = @TOOLSEXT@
DLLTOOL = @DLLTOOL@
AR = @AR@
diff --git a/aclocal.m4 b/aclocal.m4
index 5c2bbb8..774377d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -432,10 +432,10 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule \
"$ac_dir/install-lib:: $ac_dir
- \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT
+ \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
$ac_dir/uninstall::
- \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
+ \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
else
wine_fn_append_rule \
"$ac_dir/install-lib:: $ac_dir
@@ -562,10 +562,10 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule \
"$ac_dir/install:: $ac_dir
- \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT
+ \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
$ac_dir/uninstall::
- \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
+ \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
if test -z "$with_wine64" && wine_fn_has_flag installbin
then
diff --git a/configure b/configure
index 08f1ec1..2bfa2b9 100755
--- a/configure
+++ b/configure
@@ -713,7 +713,6 @@ LDD
LDRPATH_LOCAL
LDRPATH_INSTALL
DLLFLAGS
-DLLPREFIX
dlldir
CPP
OPENGL_LIBS
@@ -7135,8 +7134,6 @@ done
dlldir="\${libdir}/wine"
-DLLPREFIX=""
-
DLLFLAGS="-D_REENTRANT"
LDRPATH_INSTALL=""
@@ -7622,10 +7619,10 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule \
"$ac_dir/install-lib:: $ac_dir
- \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT
+ \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll
$ac_dir/uninstall::
- \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
+ \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
else
wine_fn_append_rule \
"$ac_dir/install-lib:: $ac_dir
@@ -7755,10 +7752,10 @@ __uninstall__: $ac_dir/uninstall"
then
wine_fn_append_rule \
"$ac_dir/install:: $ac_dir
- \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT
+ \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program
$ac_dir/uninstall::
- \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
+ \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
if test -z "$with_wine64" && wine_fn_has_flag installbin
then
@@ -8281,7 +8278,6 @@ $wine_binary $wine_binary-installed: wine_info.plist
linux-android*)
DLLFLAGS="$DLLFLAGS -fPIC"
- DLLPREFIX="lib"
LDEXECFLAGS=""
dlldir="\${libdir}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
diff --git a/configure.ac b/configure.ac
index c514192..138312f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,7 +674,6 @@ AC_CHECK_HEADERS([libprocstat.h],,,
dnl **** Check for working dll ****
AC_SUBST(dlldir,"\${libdir}/wine")
-AC_SUBST(DLLPREFIX,"")
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
AC_SUBST(LDRPATH_INSTALL,"")
AC_SUBST(LDRPATH_LOCAL,"")
@@ -894,7 +893,6 @@ $wine_binary $wine_binary-installed: wine_info.plist
linux-android*)
DLLFLAGS="$DLLFLAGS -fPIC"
- DLLPREFIX="lib"
LDEXECFLAGS=""
dlldir="\${libdir}"
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index e483693..86846cb 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -1,6 +1,6 @@
MODULE = dbghelp.dll
IMPORTLIB = dbghelp
-EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"'
+EXTRADEFS = -D_IMAGEHLP_SOURCE_
IMPORTS = psapi
DELAYIMPORTS = version
EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 10b0107..69a043c 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -422,16 +422,6 @@ static BOOL module_is_container_loaded(const struct process* pcs,
size_t len;
struct module* module;
PCWSTR filename, modname;
- static WCHAR* dll_prefix;
- static int dll_prefix_len;
-
- if (!dll_prefix)
- {
- dll_prefix_len = MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, NULL, 0 );
- dll_prefix = HeapAlloc( GetProcessHeap(), 0, dll_prefix_len * sizeof(WCHAR) );
- MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, dll_prefix, dll_prefix_len );
- dll_prefix_len--;
- }
if (!base) return FALSE;
filename = get_filename(ImageName, NULL);
@@ -444,7 +434,6 @@ static BOOL module_is_container_loaded(const struct process* pcs,
base < module->module.BaseOfImage + module->module.ImageSize)
{
modname = get_filename(module->module.LoadedImageName, NULL);
- if (dll_prefix_len && !strncmpW( modname, dll_prefix, dll_prefix_len )) modname += dll_prefix_len;
if (!strncmpiW(modname, filename, len) &&
!memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR)))
{
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index bc5f6fe..b012239 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -98,7 +98,6 @@ EXTRA_OBJS = version.o
config_EXTRADEFS = \
-DBINDIR='"${bindir}"' \
-DDLLDIR='"${dlldir}"' \
- -DDLLPREFIX='"$(DLLPREFIX)"' \
-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \
-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \
-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
diff --git a/libs/wine/config.c b/libs/wine/config.c
index a273502..3b5dd68 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -249,10 +249,9 @@ static void init_server_dir( dev_t dev, ino_t ino )
}
/* retrieve the default dll dir */
-const char *get_dlldir( const char **default_dlldir, const char **dll_prefix )
+const char *get_dlldir( const char **default_dlldir )
{
*default_dlldir = DLLDIR;
- *dll_prefix = "/" DLLPREFIX;
return dlldir;
}
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 4173945..b5b32cc 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -94,20 +94,19 @@ static load_dll_callback_t load_dll_callback;
static const char *build_dir;
static const char *default_dlldir;
-static const char *dll_prefix;
static const char **dll_paths;
static unsigned int nb_dll_paths;
static int dll_path_maxlen;
extern void mmap_init(void);
-extern const char *get_dlldir( const char **default_dlldir, const char **dll_prefix );
+extern const char *get_dlldir( const char **default_dlldir );
/* build the dll load path from the WINEDLLPATH variable */
static void build_dll_path(void)
{
int len, count = 0;
char *p, *path = getenv( "WINEDLLPATH" );
- const char *dlldir = get_dlldir( &default_dlldir, &dll_prefix );
+ const char *dlldir = get_dlldir( &default_dlldir );
if (path)
{
@@ -157,7 +156,6 @@ static void build_dll_path(void)
if (len > dll_path_maxlen) dll_path_maxlen = len;
dll_paths[nb_dll_paths++] = default_dlldir;
}
- dll_path_maxlen += strlen( dll_prefix ) - 1;
}
/* check if the library is the correct architecture */
@@ -244,7 +242,6 @@ static char *next_dll_path( struct dll_path_context *context )
default:
index -= 2;
if (index >= nb_dll_paths) return NULL;
- path = prepend( path + 1, dll_prefix, strlen( dll_prefix ));
path = prepend( path, dll_paths[index], strlen( dll_paths[index] ));
return path;
}
diff --git a/tools/makedep.c b/tools/makedep.c
index c96bf46..c56dcab 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -138,7 +138,6 @@ static const char *tools_ext;
static const char *exe_ext;
static const char *dll_ext;
static const char *man_ext;
-static const char *dll_prefix;
static const char *crosstarget;
static const char *fontforge;
static const char *convert;
@@ -3131,7 +3130,6 @@ int main( int argc, char *argv[] )
exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" );
man_ext = get_expanded_make_variable( top_makefile, "api_manext" );
dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so";
- dll_prefix = get_expanded_make_variable( top_makefile, "DLLPREFIX" );
crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" );
fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" );
convert = get_expanded_make_variable( top_makefile, "CONVERT" );
@@ -3142,7 +3140,6 @@ int main( int argc, char *argv[] )
if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;
if (!exe_ext) exe_ext = "";
if (!tools_ext) tools_ext = "";
- if (!dll_prefix) dll_prefix = "";
if (!man_ext) man_ext = "3w";
for (i = 1; i < argc; i++) update_makefile( argv[i] );
More information about the wine-cvs
mailing list