Module: wine Branch: master Commit: 832a40109e645a18d6fc608008ae357000750b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832a40109e645a18d6fc60800...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Feb 21 12:25:26 2018 +0100
makefiles: Make the directory specifications a bit more standard.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
Makefile.in | 5 ++--- aclocal.m4 | 8 ++++---- configure | 11 ++++------- configure.ac | 1 - tools/makedep.c | 12 ++++++------ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 8 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/Makefile.in b/Makefile.in index ea19306..9ad9f23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,10 +27,9 @@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ +includedir = @includedir@ fontdir = ${datadir}/wine/fonts -includedir = @includedir@/wine -dlldir = @dlldir@ -fakedlldir = ${dlldir}/fakedlls +dlldir = ${libdir}/wine top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ diff --git a/aclocal.m4 b/aclocal.m4 index 334d7a8..3fd8606 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -363,9 +363,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir $(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:: - $(RM) $(DESTDIR)$(dlldir)/$ac_dll$DLLEXT $(DESTDIR)$(fakedlldir)/$ac_dll" + $(RM) $(DESTDIR)$(dlldir)/$ac_dll$DLLEXT $(DESTDIR)$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -451,9 +451,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir $(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:: - $(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 then diff --git a/configure b/configure index 657a557..cd2b275 100755 --- a/configure +++ b/configure @@ -735,7 +735,6 @@ LDEXECFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS -dlldir CPP OPENGL_LIBS ICOTOOL @@ -7450,8 +7449,6 @@ done
-dlldir="${libdir}/wine" - DLLFLAGS="-D_REENTRANT"
LDRPATH_INSTALL="" @@ -7853,9 +7850,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir $(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:: - $(RM) $(DESTDIR)$(dlldir)/$ac_dll$DLLEXT $(DESTDIR)$(fakedlldir)/$ac_dll" + $(RM) $(DESTDIR)$(dlldir)/$ac_dll$DLLEXT $(DESTDIR)$(dlldir)/fakedlls/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -7944,9 +7941,9 @@ __uninstall__: $ac_dir/uninstall" wine_fn_append_rule \ "$ac_dir/install:: $ac_dir $(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:: - $(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 then diff --git a/configure.ac b/configure.ac index 2996010..2ec62b6 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,6 @@ AC_CHECK_HEADERS([libprocstat.h],,,
dnl **** Check for working dll ****
-AC_SUBST(dlldir,"${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") diff --git a/tools/makedep.c b/tools/makedep.c index d6019b8..8d39623 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -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], - 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], - 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) { strarray_add( &make->install_rules[INSTALL_DEV], strmake( "%s.h", obj )); 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; @@ -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], - 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( "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 ), strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); 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 ); } else diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index b47a170..e06d6cc 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y
-widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR="${includedir}/windows/" +widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR="${includedir}/wine/windows/"
EXTRALIBS = -lwpp
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91b..6de23b0 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c
winegcc_EXTRADEFS = \ - -DINCLUDEDIR=""${includedir}"" \ + -DINCLUDEDIR=""${includedir}/wine"" \ -DDLLDIR=""${dlldir}"" \ -DLIBDIR=""${libdir}"" \ -DCC=""$(CC)"" \ diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index d502e4b..500d5c1 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y
-wrc_EXTRADEFS = -DINCLUDEDIR=""${includedir}"" +wrc_EXTRADEFS = -DINCLUDEDIR=""${includedir}/wine""
EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp