makefiles: Make the directory specifications a bit more standard.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
39c8875ff8
commit
832a40109e
|
@ -27,10 +27,9 @@ libdir = @libdir@
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
|
includedir = @includedir@
|
||||||
fontdir = ${datadir}/wine/fonts
|
fontdir = ${datadir}/wine/fonts
|
||||||
includedir = @includedir@/wine
|
dlldir = ${libdir}/wine
|
||||||
dlldir = @dlldir@
|
|
||||||
fakedlldir = ${dlldir}/fakedlls
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
|
|
|
@ -363,9 +363,9 @@ __uninstall__: $ac_dir/uninstall"
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install-lib:: $ac_dir
|
"$ac_dir/install-lib:: $ac_dir
|
||||||
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$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
|
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll
|
||||||
$ac_dir/uninstall::
|
$ac_dir/uninstall::
|
||||||
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
|
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll"
|
||||||
else
|
else
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install-lib:: $ac_dir
|
"$ac_dir/install-lib:: $ac_dir
|
||||||
|
@ -451,9 +451,9 @@ __uninstall__: $ac_dir/uninstall"
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install:: $ac_dir
|
"$ac_dir/install:: $ac_dir
|
||||||
\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$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
|
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program
|
||||||
$ac_dir/uninstall::
|
$ac_dir/uninstall::
|
||||||
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
|
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program"
|
||||||
|
|
||||||
if test -z "$with_wine64" && wine_fn_has_flag installbin
|
if test -z "$with_wine64" && wine_fn_has_flag installbin
|
||||||
then
|
then
|
||||||
|
|
|
@ -735,7 +735,6 @@ LDEXECFLAGS
|
||||||
LDRPATH_LOCAL
|
LDRPATH_LOCAL
|
||||||
LDRPATH_INSTALL
|
LDRPATH_INSTALL
|
||||||
DLLFLAGS
|
DLLFLAGS
|
||||||
dlldir
|
|
||||||
CPP
|
CPP
|
||||||
OPENGL_LIBS
|
OPENGL_LIBS
|
||||||
ICOTOOL
|
ICOTOOL
|
||||||
|
@ -7450,8 +7449,6 @@ done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dlldir="\${libdir}/wine"
|
|
||||||
|
|
||||||
DLLFLAGS="-D_REENTRANT"
|
DLLFLAGS="-D_REENTRANT"
|
||||||
|
|
||||||
LDRPATH_INSTALL=""
|
LDRPATH_INSTALL=""
|
||||||
|
@ -7853,9 +7850,9 @@ __uninstall__: $ac_dir/uninstall"
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install-lib:: $ac_dir
|
"$ac_dir/install-lib:: $ac_dir
|
||||||
\$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$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
|
\$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll
|
||||||
$ac_dir/uninstall::
|
$ac_dir/uninstall::
|
||||||
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll"
|
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_dll"
|
||||||
else
|
else
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install-lib:: $ac_dir
|
"$ac_dir/install-lib:: $ac_dir
|
||||||
|
@ -7944,9 +7941,9 @@ __uninstall__: $ac_dir/uninstall"
|
||||||
wine_fn_append_rule \
|
wine_fn_append_rule \
|
||||||
"$ac_dir/install:: $ac_dir
|
"$ac_dir/install:: $ac_dir
|
||||||
\$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$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
|
\$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program
|
||||||
$ac_dir/uninstall::
|
$ac_dir/uninstall::
|
||||||
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program"
|
\$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/fakedlls/$ac_program"
|
||||||
|
|
||||||
if test -z "$with_wine64" && wine_fn_has_flag installbin
|
if test -z "$with_wine64" && wine_fn_has_flag installbin
|
||||||
then
|
then
|
||||||
|
|
|
@ -699,7 +699,6 @@ AC_CHECK_HEADERS([libprocstat.h],,,
|
||||||
|
|
||||||
dnl **** Check for working dll ****
|
dnl **** Check for working dll ****
|
||||||
|
|
||||||
AC_SUBST(dlldir,"\${libdir}/wine")
|
|
||||||
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
|
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
|
||||||
AC_SUBST(LDRPATH_INSTALL,"")
|
AC_SUBST(LDRPATH_INSTALL,"")
|
||||||
AC_SUBST(LDRPATH_LOCAL,"")
|
AC_SUBST(LDRPATH_LOCAL,"")
|
||||||
|
|
|
@ -2412,7 +2412,7 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co
|
||||||
{
|
{
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV], source->name );
|
strarray_add( &make->install_rules[INSTALL_DEV], source->name );
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV],
|
strarray_add( &make->install_rules[INSTALL_DEV],
|
||||||
strmake( "D$(includedir)/%s", get_include_install_path( source->name ) ));
|
strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2540,12 +2540,12 @@ static void output_source_idl( struct makefile *make, struct incl_file *source,
|
||||||
{
|
{
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV], xstrdup( source->name ));
|
strarray_add( &make->install_rules[INSTALL_DEV], xstrdup( source->name ));
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV],
|
strarray_add( &make->install_rules[INSTALL_DEV],
|
||||||
strmake( "D$(includedir)/%s.idl", get_include_install_path( obj ) ));
|
strmake( "D$(includedir)/wine/%s.idl", get_include_install_path( obj ) ));
|
||||||
if (source->file->flags & FLAG_IDL_HEADER)
|
if (source->file->flags & FLAG_IDL_HEADER)
|
||||||
{
|
{
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj ));
|
strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj ));
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV],
|
strarray_add( &make->install_rules[INSTALL_DEV],
|
||||||
strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) ));
|
strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!targets.count) return;
|
if (!targets.count) return;
|
||||||
|
@ -2589,10 +2589,10 @@ static void output_source_x( struct makefile *make, struct incl_file *source, co
|
||||||
{
|
{
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV], source->name );
|
strarray_add( &make->install_rules[INSTALL_DEV], source->name );
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV],
|
strarray_add( &make->install_rules[INSTALL_DEV],
|
||||||
strmake( "D$(includedir)/%s", get_include_install_path( source->name ) ));
|
strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) ));
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj ));
|
strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj ));
|
||||||
strarray_add( &make->install_rules[INSTALL_DEV],
|
strarray_add( &make->install_rules[INSTALL_DEV],
|
||||||
strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) ));
|
strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2975,7 +2975,7 @@ static void output_module( struct makefile *make )
|
||||||
add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ),
|
add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ),
|
||||||
strmake( "p$(dlldir)/%s%s", make->module, dll_ext ));
|
strmake( "p$(dlldir)/%s%s", make->module, dll_ext ));
|
||||||
add_install_rule( make, make->module, strmake( "%s.fake", make->module ),
|
add_install_rule( make, make->module, strmake( "%s.fake", make->module ),
|
||||||
strmake( "d$(fakedlldir)/%s", make->module ));
|
strmake( "d$(dlldir)/fakedlls/%s", make->module ));
|
||||||
output( "%s%s %s.fake:", module_path, dll_ext, module_path );
|
output( "%s%s %s.fake:", module_path, dll_ext, module_path );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -19,7 +19,7 @@ C_SRCS = \
|
||||||
LEX_SRCS = parser.l
|
LEX_SRCS = parser.l
|
||||||
BISON_SRCS = parser.y
|
BISON_SRCS = parser.y
|
||||||
|
|
||||||
widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\"
|
widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\"
|
||||||
|
|
||||||
EXTRALIBS = -lwpp
|
EXTRALIBS = -lwpp
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ C_SRCS = \
|
||||||
winegcc.c
|
winegcc.c
|
||||||
|
|
||||||
winegcc_EXTRADEFS = \
|
winegcc_EXTRADEFS = \
|
||||||
-DINCLUDEDIR="\"${includedir}\"" \
|
-DINCLUDEDIR="\"${includedir}/wine\"" \
|
||||||
-DDLLDIR="\"${dlldir}\"" \
|
-DDLLDIR="\"${dlldir}\"" \
|
||||||
-DLIBDIR="\"${libdir}\"" \
|
-DLIBDIR="\"${libdir}\"" \
|
||||||
-DCC="\"$(CC)\"" \
|
-DCC="\"$(CC)\"" \
|
||||||
|
|
|
@ -15,7 +15,7 @@ C_SRCS = \
|
||||||
LEX_SRCS = parser.l
|
LEX_SRCS = parser.l
|
||||||
BISON_SRCS = parser.y
|
BISON_SRCS = parser.y
|
||||||
|
|
||||||
wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\""
|
wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\""
|
||||||
|
|
||||||
EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp
|
EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue