December 2013 - Wine-commits

Alexandre Julliard : makefiles: Get rid of the no longer used PO_SRCS variables.
by Alexandre Julliard 16 Dec '13

16 Dec '13

1 0

Alexandre Julliard : makefiles: Automatically update the IDL_H_SRCS variable.
by Alexandre Julliard 16 Dec '13

16 Dec '13

Module: wine Branch: master Commit: ca41acc1f943f07e06cc70c69733c36e87fdc83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca41acc1f943f07e06cc70c69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 14 11:35:40 2013 +0100 makefiles: Automatically update the IDL_H_SRCS variable. --- dlls/infosoft/Makefile.in | 1 - dlls/jscript/Makefile.in | 1 - dlls/mshtml/tests/Makefile.in | 1 - dlls/msi/Makefile.in | 1 - dlls/msxml3/Makefile.in | 2 -- dlls/scrrun/Makefile.in | 2 -- dlls/vbscript/Makefile.in | 5 ----- dlls/wbemdisp/Makefile.in | 1 - dlls/wshom.ocx/Makefile.in | 1 - programs/wscript/Makefile.in | 1 - tools/make_makefiles | 4 +++- 11 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index f7c1bbf..3acc7c9 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -5,7 +5,6 @@ C_SRCS = \ infosoft_main.c \ wordbreaker.c -IDL_H_SRCS = infosoft.idl IDL_R_SRCS = infosoft.idl @MAKE_DLL_RULES@ diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index cb041b2..9078b04 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -30,7 +30,6 @@ RC_SRCS = jscript.rc IDL_TLB_SRCS = jsglobal.idl IDL_R_SRCS = jscript_classes.idl -IDL_H_SRCS = jscript_classes.idl BISON_SRCS = \ parser.y diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index e339175..6471156 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ style.c IDL_TLB_SRCS = test_tlb.idl -IDL_H_SRCS = test_tlb.idl RC_SRCS = rsrc.rc diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index cba9c03..36cf303 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -44,7 +44,6 @@ C_SRCS = \ upgrade.c \ where.c -IDL_H_SRCS = msiserver.idl IDL_I_SRCS = msiserver.idl IDL_R_SRCS = msiserver.idl IDL_TLB_SRCS = msiserver.idl diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 1e056cf..ed4c039 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -47,8 +47,6 @@ RC_SRCS = \ IDL_R_SRCS = xmlparser.idl -IDL_H_SRCS = xmlparser.idl - IDL_TLB_SRCS = msxml3_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index cb5d981..362cba7 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -10,6 +10,4 @@ RC_SRCS = scrrun.rc IDL_TLB_SRCS = scrrun.idl -IDL_H_SRCS = scrrun.idl - @MAKE_DLL_RULES@ diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 5bc66cf..381dfd1 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -18,11 +18,6 @@ BISON_SRCS = \ RC_SRCS = vbscript.rc -IDL_H_SRCS = \ - vbscript_classes.idl \ - vbsglobal.idl \ - vbsregexp55.idl - IDL_TLB_SRCS = \ vbsglobal.idl \ vbsregexp10.idl \ diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 3f3ff49..dbd76d9 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -6,7 +6,6 @@ C_SRCS = \ main.c IDL_R_SRCS = wbemdisp_classes.idl -IDL_H_SRCS = wbemdisp_classes.idl IDL_TLB_SRCS = wbemdisp_tlb.idl diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 6635e5d..9d49bde 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ RC_SRCS = wshom.rc -IDL_H_SRCS = wshom.idl IDL_TLB_SRCS = wshom.idl @MAKE_DLL_RULES@ diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 2f4074e..2e85e35 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ host.c \ main.c -IDL_H_SRCS = ihost.idl IDL_TLB_SRCS = ihost.idl @MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 6b6cdb9..13106e7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -485,7 +485,7 @@ sub assign_sources_to_makefiles(@) { my %flags = get_makedep_flags( $file ); push @{${$make}{"=IDL_C_SRCS"}}, $name if defined $flags{"client"}; - push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"}; + push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"} || !(keys %flags); push @{${$make}{"=IDL_I_SRCS"}}, $name if defined $flags{"ident"}; push @{${$make}{"=IDL_P_SRCS"}}, $name if defined $flags{"proxy"}; push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"}; @@ -510,6 +510,7 @@ sub assign_sources_to_makefiles(@) unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; + unshift @{${$make}{"=IDL_H_SRCS"}}, "\$(PUBLIC_IDL_H_SRCS) \$(PRIVATE_IDL_H_SRCS)"; # preserve shared source files from the parent makefile foreach my $file (@makefiles) @@ -619,6 +620,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" ); replace_makefile_variable( $file, "IDL_C_SRCS" ); + replace_makefile_variable( $file, "IDL_H_SRCS" ); replace_makefile_variable( $file, "IDL_I_SRCS" ); replace_makefile_variable( $file, "IDL_P_SRCS" ); replace_makefile_variable( $file, "IDL_R_SRCS" );

1 0

Alexandre Julliard : makefiles: Don't use Make. rules in the top-level Makefile.
by Alexandre Julliard 16 Dec '13

16 Dec '13

Module: wine Branch: master Commit: a8b633b1a194d12a946f39cbf4cfed46953e5360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b633b1a194d12a946f39cbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 15 10:38:25 2013 +0100 makefiles: Don't use Make.rules in the top-level Makefile. --- Make.rules.in | 1 - Make.vars.in | 1 + Makefile.in | 14 ++++++++------ configure | 4 ++-- configure.ac | 4 ++-- tools/make_makefiles | 1 + 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 27e5667..5948180 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,7 +19,6 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) diff --git a/Make.vars.in b/Make.vars.in index ac74f1f..7b6e265 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -76,6 +76,7 @@ INSTALL = @INSTALL@ $(INSTALL_FLAGS) INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS) +CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c prog_manext = 1 api_manext = 3w conf_manext = 5 diff --git a/Makefile.in b/Makefile.in index c2bb1ed..c7889d0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,8 +28,6 @@ INSTALLDIRS = \ all: wine @echo "Wine build complete." -(a)MAKE_RULES@ - # Rules for re-running configure config.status: $(srcdir)/configure @@ -41,15 +39,19 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status # Rules for cleaning -.PHONY: __clean__ +.PHONY: clean distclean __clean__ + clean:: __clean__ distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp $(RM) -r autom4te.cache -# Rules for uninstalling +# Rules for installing + +$(INSTALLDIRS): + $(MKDIR_P) -m 755 $@ -.PHONY: __uninstall__ +.PHONY: install install-lib install-dev uninstall __uninstall__ uninstall:: __uninstall__ -rmdir $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) @@ -58,7 +60,7 @@ uninstall:: __uninstall__ # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include -.PHONY: check test testclean crosstest __tooldeps__ __builddeps__ +.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/configure b/configure index 8fde226..e604301 100755 --- a/configure +++ b/configure @@ -16681,7 +16681,7 @@ wine_fn_append_rule " .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile" if test "x$enable_fonts" != xno; then @@ -17525,7 +17525,7 @@ then ac_config_commands="$ac_config_commands tools" wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" else diff --git a/configure.ac b/configure.ac index 34b7a52..fc6cdde 100644 --- a/configure.ac +++ b/configure.ac @@ -2664,7 +2664,7 @@ WINE_APPEND_RULE([ .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) @@ -3502,7 +3502,7 @@ then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( [tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h - \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include -D__WINESRC__ \$(EXTRACFLAGS) \$(CPPFLAGS) \$(CFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext]) else diff --git a/tools/make_makefiles b/tools/make_makefiles index 13106e7..34fef85 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -543,6 +543,7 @@ sub update_makefiles(@) foreach my $file (sort @_) { my %make = %{$makefiles{$file}}; + next unless defined $make{"=rules"}; my $rules = $make{"=rules"}; my $args = ""; my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}});

1 0

Alexandre Julliard : makefiles: Generate individual . gitignore files corresponding to the build targets.
by Alexandre Julliard 16 Dec '13

16 Dec '13

Module: wine Branch: master Commit: 3bcad54fc6b27fc1814a2349105b3b7ab30ad179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bcad54fc6b27fc1814a23491… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 20:37:26 2013 +0100 makefiles: Generate individual .gitignore files corresponding to the build targets. --- .gitignore | 285 +--------------------------------------------- aclocal.m4 | 10 +- configure | 10 +- documentation/.gitignore | 1 - fonts/.gitignore | 50 -------- libs/.gitignore | 3 - loader/Makefile.in | 2 - tools/make_makefiles | 46 +------- tools/makedep.c | 89 +++++++++++---- 9 files changed, 91 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bcad54fc6b27fc1814a2…

1 0

Alexandre Julliard : makefiles: Generate the top-level . gitignore from configure.
by Alexandre Julliard 16 Dec '13

16 Dec '13

Module: wine Branch: master Commit: e3fc518e8e96b853fbeb4fa79e610c3c6cc79223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fc518e8e96b853fbeb4fa79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 15 11:44:39 2013 +0100 makefiles: Generate the top-level .gitignore from configure. --- .gitignore | 53 - Makefile.in | 2 +- aclocal.m4 | 33 +- configure |12628 +++++++++++++++++++++++++------------------------- configure.ac | 66 + tools/make_makefiles | 88 - 6 files changed, 6444 insertions(+), 6426 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3fc518e8e96b853fbeb4…

1 0

Stefan Dösinger : wined3d: Don' t check for render target usage in wined3d_surface_set_mem.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: a1762ba8a46eca5c7ef1e6a509cdc39fbbb44f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1762ba8a46eca5c7ef1e6a50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 13 12:30:12 2013 +0100 wined3d: Don't check for render target usage in wined3d_surface_set_mem. Ddraw and d3d9 already take care of this. --- dlls/wined3d/surface.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c40516..f18bab1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2611,13 +2611,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - /* Render targets depend on their hdc, and we can't create an hdc on a user pointer. */ - if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - { - ERR("Not supported on render targets.\n"); - return WINED3DERR_INVALIDCALL; - } - if (mem && mem != surface->resource.allocatedMemory) { /* Do I have to copy the old surface content? */

1 0

Stefan Dösinger : wined3d: Don' t store user memory in allocatedMemory.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: fb752928757498e04362b4ca1366e83985273173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb752928757498e04362b4ca1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 13 12:30:13 2013 +0100 wined3d: Don't store user memory in allocatedMemory. --- dlls/wined3d/surface.c | 45 ++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f18bab1..2fca299 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -88,9 +88,6 @@ static void surface_cleanup(struct wined3d_surface *surface) surface->resource.allocatedMemory = NULL; } - if (surface->flags & SFLAG_USERPTR) - surface->resource.allocatedMemory = NULL; - if (surface->overlay_dest) list_remove(&surface->overlay_entry); @@ -497,7 +494,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.height * wined3d_surface_get_pitch(surface)); } - else + else if (!surface->user_memory) { /* This is to make maps read the GL texture although memory is allocated. */ surface->flags &= ~SFLAG_INSYSMEM; @@ -519,16 +516,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) { + if (surface->user_memory) + { + data->addr = surface->user_memory; + data->buffer_object = 0; + return; + } if (surface->flags & SFLAG_PBO) { data->addr = NULL; data->buffer_object = surface->pbo; + return; } - else - { - data->addr = surface->resource.allocatedMemory; - data->buffer_object = 0; - } + data->addr = surface->resource.allocatedMemory; + data->buffer_object = 0; } static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) @@ -587,7 +588,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO + || surface->user_memory)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -831,6 +833,9 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return ret; } + if (surface->user_memory) + return surface->user_memory; + return surface->resource.allocatedMemory; } @@ -1296,7 +1301,11 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static BOOL surface_init_sysmem(struct wined3d_surface *surface) { - if (!surface->resource.allocatedMemory) + if (surface->resource.allocatedMemory) + { + memset(surface->resource.allocatedMemory, 0, surface->resource.size); + } + else if (!surface->user_memory) { if (!surface->resource.heap_memory) { @@ -1314,10 +1323,6 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) surface->resource.allocatedMemory = surface->resource.heap_memory; } - else - { - memset(surface->resource.allocatedMemory, 0, surface->resource.size); - } surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); @@ -1491,6 +1496,9 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + if (surface->user_memory) + return surface->user_memory; + return surface->resource.allocatedMemory; } @@ -2611,7 +2619,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - if (mem && mem != surface->resource.allocatedMemory) + if (mem && mem != surface->user_memory) { /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) @@ -2626,8 +2634,9 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem else if (!(surface->flags & SFLAG_USERPTR)) { wined3d_resource_free_sysmem(&surface->resource); + surface->resource.allocatedMemory = NULL; } - surface->resource.allocatedMemory = mem; + surface->user_memory = mem; surface->flags |= SFLAG_USERPTR; /* Now the surface memory is most up do date. Invalidate drawable and texture. */ @@ -2646,7 +2655,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem if (!mem) { - surface->resource.allocatedMemory = NULL; + surface->user_memory = NULL; surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); if (surface->flags & SFLAG_CLIENT) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0a8624..5f42964 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2186,6 +2186,7 @@ struct wined3d_surface struct wined3d_swapchain *swapchain; struct wined3d_palette *palette; /* D3D7 style palette handling */ DWORD draw_binding; + void *user_memory; DWORD flags;

1 0

Alexandre Julliard : makefiles: Generate rules from makedep for .in files.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: c2efb3b382aa10d2474d5e4a719b87c1929c6afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2efb3b382aa10d2474d5e4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:04:53 2013 +0100 makefiles: Generate rules from makedep for .in files. --- Make.rules.in | 2 +- Make.vars.in | 2 +- configure | 6 ------ configure.ac | 6 ------ loader/Makefile.in | 4 ++++ tools/Makefile.in | 6 +++--- tools/make_makefiles | 8 +++++++- tools/makedep.c | 12 +++++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 6b9a996..27e5667 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -78,7 +78,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS) $(IDL_TLB_SRCS) \ - $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(EXTRA_OBJS) $(MANPAGES) + $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(IN_SRCS) $(EXTRA_OBJS) $(MANPAGES) depend: dummy $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(PARENTSRC:%=-P%) $(EXTRAINCL) $(DEPEND_SRCS) diff --git a/Make.vars.in b/Make.vars.in index 73bb0ae..a002c92 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -70,7 +70,7 @@ LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a -SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' +SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ INSTALL = @INSTALL@ $(INSTALL_FLAGS) diff --git a/configure b/configure index 1b160db..c080f84 100755 --- a/configure +++ b/configure @@ -7493,9 +7493,6 @@ $wine_binary: main.o wine_info.plist wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) - -wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h - LC_ALL=C sed -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g' \$(srcdir)/wine_info.plist.in >\$@ || (\$(RM) \$@ && false) " ;; @@ -17566,9 +17563,6 @@ else as_fn_append LOADER_RULES " all: wine.inf -wine.inf: wine.inf.in \$(top_builddir)/include/config.h - LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' \$(srcdir)/wine.inf.in >\$@ || (\$(RM) \$@ && false) - install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls diff --git a/configure.ac b/configure.ac index c2c7460..38594e4 100644 --- a/configure.ac +++ b/configure.ac @@ -878,9 +878,6 @@ $wine_binary: main.o wine_info.plist wine-installed: main.o wine_info.plist \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) - -wine_info.plist: wine_info.plist.in \$(top_builddir)/include/config.h - LC_ALL=C sed -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g' \$(srcdir)/wine_info.plist.in >\$@ || (\$(RM) \$@ && false) "]) ;; @@ -3538,9 +3535,6 @@ else AS_VAR_APPEND([LOADER_RULES],[" all: wine.inf -wine.inf: wine.inf.in \$(top_builddir)/include/config.h - LC_ALL=C sed -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' \$(srcdir)/wine.inf.in >\$@ || (\$(RM) \$@ && false) - install install-lib:: wine.inf \$(DESTDIR)\$(datadir)/wine install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls diff --git a/loader/Makefile.in b/loader/Makefile.in index df8d0fd..1bdefb2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -20,6 +20,10 @@ MANPAGES = \ wine.man.in \ wine.pl.UTF-8.man.in +IN_SRCS = \ + wine.inf.in \ + wine_info.plist.in + INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/wine diff --git a/tools/Makefile.in b/tools/Makefile.in index ec6921a..6d889b0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -20,6 +20,9 @@ C_SRCS = \ makedep.c \ sfnt2fnt.c +IN_SRCS = \ + wineapploader.in + INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(datadir)/applications @@ -42,9 +45,6 @@ fnt2fon$(EXEEXT): fnt2fon.o sfnt2fnt$(EXEEXT): sfnt2fnt.o $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) -wineapploader: wineapploader.in - sed -e 's,@bindir\@,$(bindir),g' $(srcdir)/wineapploader.in >$@ || ($(RM) $@ && false) - install install-lib:: $(DESTDIR)$(datadir)/applications $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) diff --git a/tools/make_makefiles b/tools/make_makefiles index d24dffc..8d94bfe 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -328,7 +328,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -422,6 +422,7 @@ sub assign_sources_to_makefiles(@) foreach my $file (@_) { next if defined $ignored_source_files{$file}; + next if $file =~ /Makefile\.in$/; my $dir = dirname( $file ); my $subdir = $dir; @@ -501,6 +502,10 @@ sub assign_sources_to_makefiles(@) push @{${$make}{"=MANPAGES"}}, $name; ${${$make}{"=flags"}}{"manpage"} = 1; } + elsif ($name =~ /\.in$/) + { + push @{${$make}{"=IN_SRCS"}}, $name; + } } } @@ -625,6 +630,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IDL_S_SRCS" ); replace_makefile_variable( $file, "IDL_TLB_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); + replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); replace_makefile_variable( $file, "MANPAGES" ); diff --git a/tools/makedep.c b/tools/makedep.c index 32383f4..f29aa44 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -914,15 +914,17 @@ static void parse_rc_file( struct incl_file *pFile, FILE *file ) /******************************************************************* - * parse_man_page + * parse_in_file */ -static void parse_man_page( struct incl_file *source, FILE *file ) +static void parse_in_file( struct incl_file *source, FILE *file ) { char *p, *buffer; /* make sure it gets rebuilt when the version changes */ add_include( source, "config.h", 1 ); + if (!strendswith( source->filename, ".man.in" )) return; /* not a man page */ + input_line = 0; while ((buffer = get_line( file ))) { @@ -1012,8 +1014,8 @@ static void parse_file( struct incl_file *source, int src ) parse_c_file( source, file ); else if (strendswith( source->filename, ".rc" )) parse_rc_file( source, file ); - else if (strendswith( source->filename, ".man.in" )) - parse_man_page( source, file ); + else if (strendswith( source->filename, ".in" )) + parse_in_file( source, file ); fclose(file); input_file_name = NULL; } @@ -1269,7 +1271,7 @@ static void output_sources(void) } column += output( " %s", source->filename ); } - else if (!strcmp( ext, "in" )) /* man page */ + else if (!strcmp( ext, "in" )) /* .in file or man page */ { if (strendswith( obj, ".man" ) && source->sourcename) {

1 0

Alexandre Julliard : makefiles: Get rid of the VPATH directive.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 070147a0341769234a52f83f298ab5a39a60a66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=070147a0341769234a52f83f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 20:08:02 2013 +0100 makefiles: Get rid of the VPATH directive. --- Make.vars.in | 1 - configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index a002c92..ac74f1f 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -15,7 +15,6 @@ fakedlldir = $(dlldir)/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ -VPATH = @srcdir@ SHELL = /bin/sh RM = rm -f MV = mv diff --git a/configure b/configure index c080f84..1f541e1 100755 --- a/configure +++ b/configure @@ -7268,10 +7268,10 @@ fi LIBWINE_RULES=" all: libwine.dll libwine.a -libwine.a: wine.def +libwine.a: \$(srcdir)/wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def +libwine.dll: \$(OBJS) \$(srcdir)/wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -7994,7 +7994,7 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_RULES=" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map +libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -17539,7 +17539,7 @@ if test "x$enable_tools" != xno then ac_config_commands="$ac_config_commands tools" - wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h + wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" diff --git a/configure.ac b/configure.ac index 38594e4..b6b9653 100644 --- a/configure.ac +++ b/configure.ac @@ -722,10 +722,10 @@ case $host_os in AC_SUBST(LIBWINE_RULES,[" all: libwine.dll libwine.a -libwine.a: wine.def +libwine.a: \$(srcdir)/wine.def \$(DLLTOOL) -l \$@ -d \$(srcdir)/wine.def -libwine.dll: \$(OBJS) wine.def +libwine.dll: \$(OBJS) \$(srcdir)/wine.def \$(CC) -shared \$(srcdir)/wine.def -o \$@ \$(OBJS) $crtlibs \$(EXTRALIBS) install install-lib:: libwine.dll \$(DESTDIR)\$(libdir) dummy @@ -990,7 +990,7 @@ wine-installed: main.o AC_SUBST(LIBWINE_RULES,[" all: libwine.so -libwine.so.\$(VERSION): \$(OBJS) wine.map +libwine.so.\$(VERSION): \$(OBJS) \$(srcdir)/wine.map $LDSHARED \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@ libwine.so.\$(SOVERSION): libwine.so.\$(VERSION) @@ -3509,7 +3509,7 @@ if test "x$enable_tools" != xno then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( -[tools/makedep$ac_exeext: tools/makedep.c include/config.h +[tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext])

1 0

Alexandre Julliard : makefiles: Automatically create object sub-directories when needed.
by Alexandre Julliard 13 Dec '13

13 Dec '13

Module: wine Branch: master Commit: 73d1fa977a4907a73007a800c4355dcef7049a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d1fa977a4907a73007a800c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 21:10:55 2013 +0100 makefiles: Automatically create object sub-directories when needed. --- aclocal.m4 | 7 ------- configure | 36 ------------------------------------ configure.ac | 8 -------- tools/makedep.c | 47 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 35 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73d1fa977a4907a73007a…

1 0