June 2011 - Wine-commits - list.winehq.org

Francois Gouget : comdlg32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 7777d61ff4f504f2ba1d34860970cad342ded345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7777d61ff4f504f2ba1d34860… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 20:20:50 2011 +0200 comdlg32: Add a trailing '\n' to a TRACE() call. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 354e952..bc309c9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -993,7 +993,7 @@ static LRESULT ctrl_container_on_create(HWND hwnd, CREATESTRUCTW *crs) static LRESULT ctrl_container_on_wm_destroy(FileDialogImpl *This) { customctrl *cur1, *cur2; - TRACE("%p", This); + TRACE("%p\n", This); LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->cctrls, customctrl, entry) {

1 0

Alexandre Goujon : winenas.drv: Avoid a warning in a trace on x86_64.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 43c648ecdc595a59abece282c5db178ede931f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c648ecdc595a59abece282c… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Jun 11 14:30:29 2011 +0200 winenas.drv: Avoid a warning in a trace on x86_64. --- dlls/winenas.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index a5768fa..4b63ea1 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -1360,7 +1360,7 @@ event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) nas_state(event->prev_state), nas_state(event->cur_state), nas_reason(event->reason), - event->num_bytes, wwo->freeBytes); + (long)event->num_bytes, wwo->freeBytes); if (event->cur_state == AuStatePause && event->reason != AuReasonUser) { wwo->freeBytes += event->num_bytes;

1 0

David Hedberg : kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock ().
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: fed025fd42b642ae86189f329043969599ed6501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed025fd42b642ae86189f329… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jun 13 08:22:15 2011 +0200 kernel32: GlobalSize() should also work with GMEM_MOVEABLE data pointers received from GlobalLock(). --- dlls/kernel32/heap.c | 6 ++++++ dlls/kernel32/tests/heap.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 7be9172..4ade995 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -820,6 +820,12 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) if(ISPOINTER(hmem)) { retval=HeapSize(GetProcessHeap(), 0, hmem); + + if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); + if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + } } else { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f7ac478..26bc58f 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -85,7 +85,7 @@ static void test_heap(void) UINT flags; HGLOBAL gbl; HGLOBAL hsecond; - SIZE_T size; + SIZE_T size, size2; /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -403,6 +403,36 @@ static void test_heap(void) "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_MOVEABLE) */ + gbl = GlobalAlloc(GMEM_MOVEABLE, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl != mem, "unexpectedly equal.\n"); + + size = GlobalSize(gbl); + size2 = GlobalSize(mem); + ok(size == 0x123, "got %lu\n", size); + ok(size2 == 0x123, "got %lu\n", size2); + + GlobalFree(gbl); + + /* trying to get size from data pointer (GMEM_FIXED) */ + gbl = GlobalAlloc(GMEM_FIXED, 0x123); + ok(gbl != NULL, "returned NULL\n"); + mem = GlobalLock(gbl); + ok(mem != NULL, "returned NULL.\n"); + ok(gbl == mem, "got %p, %p.\n", gbl, mem); + + size = GlobalSize(gbl); + ok(size == 0x123, "got %lu\n", size); + + GlobalFree(gbl); + + size = GlobalSize((void *)0xdeadbee0); + ok(size == 0, "got %lu\n", size); + } static void test_obsolete_flags(void)

1 0

Alexandre Julliard : kernel32: Fix some 64-bit issues in GlobalSize().
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 4b12e9c5a033d214831d9aa80ba986b04faf43b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b12e9c5a033d214831d9aa80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 11:40:53 2011 +0200 kernel32: Fix some 64-bit issues in GlobalSize(). --- dlls/kernel32/heap.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4ade995..598bfe4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -808,7 +808,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - DWORD retval; + SIZE_T retval; PGLOBAL32_INTERN pintern; if (!((ULONG_PTR)hmem >> 16)) @@ -821,10 +821,10 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { retval=HeapSize(GetProcessHeap(), 0, hmem); - if (retval == (DWORD)-1) /* It might be a GMEM_MOVEABLE data pointer */ + if (retval == ~0ul) /* It might be a GMEM_MOVEABLE data pointer */ { - retval = HeapSize(GetProcessHeap(), 0, (char*)(hmem) - HGLOBAL_STORAGE); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -838,9 +838,8 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) retval = 0; else { - retval = HeapSize(GetProcessHeap(), 0, - (char *)(pintern->Pointer) - HGLOBAL_STORAGE ); - if (retval != (DWORD)-1) retval -= HGLOBAL_STORAGE; + retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~0ul) retval -= HGLOBAL_STORAGE; } } else @@ -851,8 +850,7 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) } RtlUnlockHeap(GetProcessHeap()); } - /* HeapSize returns 0xffffffff on failure */ - if (retval == 0xffffffff) retval = 0; + if (retval == ~0ul) retval = 0; return retval; }

1 0

Alexandre Julliard : rpcrt4: Fix handling of complex types of return values on the server side.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 1c632ffe8e6f153b1d2f413d8d16daad82c3e4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c632ffe8e6f153b1d2f413d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 15:11:40 2011 +0200 rpcrt4: Fix handling of complex types of return values on the server side. --- dlls/rpcrt4/ndr_stubless.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0f54211..436dccf 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1078,10 +1078,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, TRACE("\tbase type: 0x%02x\n", *pTypeFormat); - /* make a note of the address of the return value parameter for later */ - if (pParam->param_attributes.IsReturn) - retval_ptr = (LONG_PTR *)pArg; - switch (phase) { case STUBLESS_MARSHAL: @@ -1222,6 +1218,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, current_offset += sizeof(NDR_PARAM_OIF_OTHER); } TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); + + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) retval_ptr = (LONG_PTR *)pArg; } return retval_ptr;

1 0

Alexandre Julliard : rpcrt4: Fix handling of complex types of return values on the client side.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: b0f858607893c46312277abda3d15c8f4ca7a59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f858607893c46312277abda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 15:11:40 2011 +0200 rpcrt4: Fix handling of complex types of return values on the client side. --- dlls/rpcrt4/ndr_stubless.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 436dccf..f508c9e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -332,11 +332,8 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, case PROXY_UNMARSHAL: if (pParam->param_attributes.IsOut) { - if (pParam->param_attributes.IsReturn) - call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); - else - call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); - TRACE("pRetVal = %p\n", pRetVal); + if (pParam->param_attributes.IsReturn) pArg = pRetVal; + call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); } break; default: @@ -386,9 +383,8 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, case PROXY_UNMARSHAL: if (pParam->param_attributes.IsOut) { - if (pParam->param_attributes.IsReturn) - call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); - else if (pParam->param_attributes.IsByValue) + if (pParam->param_attributes.IsReturn) pArg = pRetVal; + if (pParam->param_attributes.IsByValue) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); else call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0);

1 0

Alexandre Julliard : rpcrt4: Also check base types for null ref pointers.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: e8567110b3cdb3014a5c387278129b08e88a96c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8567110b3cdb3014a5c38727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 20:14:40 2011 +0200 rpcrt4: Also check base types for null ref pointers. --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f508c9e..f019776 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -315,7 +315,10 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, &pParam->type_format_char; if (pParam->param_attributes.IsSimpleRef) + { pArg = *(unsigned char **)pArg; + if (!pArg) RpcRaiseException(RPC_X_NULL_REF_POINTER); + } TRACE("\tbase type: 0x%02x\n", *pTypeFormat);

1 0

Alexandre Julliard : widl: Default to the cdecl calling convention in client/server functions.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: 717bd66440522c8ed16af3ca58d822281c5479b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717bd66440522c8ed16af3ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 13:40:05 2011 +0200 widl: Default to the cdecl calling convention in client/server functions. --- dlls/rpcrt4/tests/server.c | 225 +++++++++++++++----------------------------- programs/rpcss/epmp.c | 76 ++++++++-------- programs/rpcss/irotp.c | 14 ++-- programs/services/rpc.c | 109 +++++++++------------- tools/widl/client.c | 4 +- tools/widl/header.c | 4 +- 6 files changed, 170 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=717bd66440522c8ed16af…

1 0

Alexandre Julliard : makefiles: Add a more generic handling of makefile generation flags.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: e2db7946309fe7f2b43258cc8b838119f5baca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2db7946309fe7f2b43258cc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 12 11:41:43 2011 +0200 makefiles: Add a more generic handling of makefile generation flags. --- aclocal.m4 | 20 ++++++---- configure | 98 ++++++++++++++++++++++++++------------------------ configure.ac | 94 ++++++++++++++++++++++++------------------------ tools/make_makefiles | 46 +++++++++++++---------- 4 files changed, 136 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2db7946309fe7f2b4325…

1 0

Alexandre Julliard : makefiles: Use generic flags to specify which directories need a make install.
by Alexandre Julliard 13 Jun '11

13 Jun '11

Module: wine Branch: master Commit: e492fcc833446f003e82f8172ba0f1bcc2cdf697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e492fcc833446f003e82f8172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 12 12:03:53 2011 +0200 makefiles: Use generic flags to specify which directories need a make install. --- aclocal.m4 | 26 ++++++++++++++++++++------ configure | 40 +++++++++++++++++++++++++++------------- configure.ac | 14 +++++++------- tools/make_makefiles | 5 +++++ 4 files changed, 59 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 86ba73b..781e627 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -211,15 +211,29 @@ wine_fn_config_makefile () "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) -install:: $ac_dir + @cd $ac_dir && \$(MAKE)" + + wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return + + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install:: $ac_dir @cd $ac_dir && \$(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && \$(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" + + if wine_fn_has_flag install-lib $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib" + fi + + if wine_fn_has_flag install-dev $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev" + fi } wine_fn_config_lib () diff --git a/configure b/configure index 700069d..36692f7 100755 --- a/configure +++ b/configure @@ -14578,15 +14578,29 @@ fi "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy - @cd $ac_dir && \$(MAKE) -install:: $ac_dir + @cd $ac_dir && \$(MAKE)" + + wine_fn_has_flag install-lib $ac_flags || wine_fn_has_flag install-dev $ac_flags || return + + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install:: $ac_dir @cd $ac_dir && \$(MAKE) install -install-lib:: $ac_dir - @cd $ac_dir && \$(MAKE) install-lib -install-dev:: $ac_dir - @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" + + if wine_fn_has_flag install-lib $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install-lib:: $ac_dir + @cd $ac_dir && \$(MAKE) install-lib" + fi + + if wine_fn_has_flag install-dev $ac_flags + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install-dev:: $ac_dir + @cd $ac_dir && \$(MAKE) install-dev" + fi } wine_fn_config_lib () @@ -15416,7 +15430,7 @@ wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll winenas.drv enable_winenas_drv wine_fn_config_dll wineoss.drv enable_wineoss_drv -wine_fn_config_dll wineps.drv enable_wineps_drv +wine_fn_config_dll wineps.drv enable_wineps_drv install-lib wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder wine_fn_config_dll winequartz.drv enable_winequartz_drv @@ -15463,12 +15477,12 @@ wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_makefile documentation enable_documentation -wine_fn_config_makefile fonts enable_fonts -wine_fn_config_makefile include enable_include +wine_fn_config_makefile fonts enable_fonts install-lib +wine_fn_config_makefile include enable_include install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader +wine_fn_config_makefile loader enable_loader install-lib wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install wine_fn_config_program cabarc enable_cabarc install @@ -15544,8 +15558,8 @@ wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript install wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program xcopy enable_xcopy install,po -wine_fn_config_makefile server enable_server -wine_fn_config_tool tools +wine_fn_config_makefile server enable_server install-lib +wine_fn_config_tool tools install-dev,install-lib wine_fn_config_tool tools/widl wine_fn_config_tool tools/winebuild wine_fn_config_tool tools/winedump diff --git a/configure.ac b/configure.ac index 04166e1..81a32f5 100644 --- a/configure.ac +++ b/configure.ac @@ -2881,7 +2881,7 @@ WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(winenas.drv) WINE_CONFIG_DLL(wineoss.drv) -WINE_CONFIG_DLL(wineps.drv) +WINE_CONFIG_DLL(wineps.drv,,[install-lib]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) WINE_CONFIG_DLL(winequartz.drv) @@ -2928,12 +2928,12 @@ WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE([documentation]) -WINE_CONFIG_MAKEFILE([fonts]) -WINE_CONFIG_MAKEFILE([include]) +WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) +WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine]) +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader]) +WINE_CONFIG_MAKEFILE([loader],,[install-lib]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install]) WINE_CONFIG_PROGRAM(cabarc,,[install]) @@ -3009,8 +3009,8 @@ WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[install]) WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) -WINE_CONFIG_MAKEFILE([server]) -WINE_CONFIG_TOOL(tools) +WINE_CONFIG_MAKEFILE([server],,[install-lib]) +WINE_CONFIG_TOOL(tools,[install-dev,install-lib]) WINE_CONFIG_TOOL(tools/widl) WINE_CONFIG_TOOL(tools/winebuild) WINE_CONFIG_TOOL(tools/winedump) diff --git a/tools/make_makefiles b/tools/make_makefiles index f662e2a..6d7cd36 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -327,6 +327,11 @@ sub parse_makefile($) push @{$make{"=flags"}}, "staticimplib" if $var eq "IMPLIB_SRCS"; next; } + if (/(install-lib|install-dev)\s*:/) + { + push @{$make{"=flags"}}, $1; + next; + } if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/) { die "Variable $1 in $file.in is obsolete";

1 0