From ce231568a97285102a18a9caf192c52b7172ac1e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 25 Feb 2016 15:36:02 +0900 Subject: [PATCH] makefiles: Generate top-level rules for pot files. Get rid of the rsrc.pot and msg.pot hacks, use each individual source file instead. Signed-off-by: Alexandre Julliard --- aclocal.m4 | 33 +------ configure | 212 +++++++++++++++++++------------------------ configure.ac | 176 +++++++++++++++++------------------ tools/make_makefiles | 4 +- tools/makedep.c | 118 ++++++++++++++++-------- 5 files changed, 257 insertions(+), 286 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 99faf92d2fc..4171f47ccba 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -199,7 +199,6 @@ dnl AC_DEFUN([WINE_CONFIG_HELPERS], [wine_rules_file=conf$$rules.make rm -f $wine_rules_file -ALL_POT_FILES="" GITIGNORE="# Automatically generated by configure; DO NOT EDIT!!" AC_SUBST(SUBDIRS,"") AC_SUBST(ALL_TEST_RESOURCES,"") @@ -233,28 +232,6 @@ wine_fn_depend_rules () wine_fn_append_file SUBDIRS $ac_dir } -wine_fn_pot_rules () -{ - test "x$with_gettextpo" = xyes || return - - if wine_fn_has_flag mc - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule \ -"$ac_dir/msg.pot: dummy - @cd $ac_dir && \$(MAKE) msg.pot -$ac_dir/msg.pot: tools/wmc include" - fi - if wine_fn_has_flag po - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule \ -"$ac_dir/rsrc.pot: dummy - @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/rsrc.pot: tools/wrc include" - fi -} - wine_fn_all_rules () { wine_fn_depend_rules @@ -383,8 +360,6 @@ wine_fn_config_dll () ac_clean= wine_fn_has_flag implib && ac_clean="$ac_clean $ac_file.$IMPLIBEXT" - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" AS_VAR_IF([$ac_enable],[no], @@ -393,7 +368,6 @@ wine_fn_config_dll () then wine_fn_depend_rules wine_fn_clean_rules $ac_clean - wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return @@ -422,9 +396,7 @@ $ac_dir/uninstall:: \$(INSTALL_PROGRAM) $ac_dir/$ac_dll \$(DESTDIR)\$(dlldir)/$ac_dll $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" - fi - - wine_fn_pot_rules]) + fi]) if wine_fn_has_flag staticimplib then @@ -520,8 +492,6 @@ wine_fn_config_program () esac ac_clean= - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" wine_fn_has_flag manpage && ac_clean="$ac_clean $ac_dir/$ac_name.man" test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_program" @@ -530,7 +500,6 @@ wine_fn_config_program () wine_fn_all_rules wine_fn_clean_rules $ac_clean wine_fn_append_rule "$ac_dir: __builddeps__" - wine_fn_pot_rules wine_fn_has_flag install || return wine_fn_append_rule \ diff --git a/configure b/configure index 8200927d9fc..b11d5fb4507 100755 --- a/configure +++ b/configure @@ -7414,7 +7414,6 @@ fi wine_rules_file=conf$$rules.make rm -f $wine_rules_file -ALL_POT_FILES="" GITIGNORE="# Automatically generated by configure; DO NOT EDIT!!" SUBDIRS="" @@ -7450,28 +7449,6 @@ wine_fn_depend_rules () wine_fn_append_file SUBDIRS $ac_dir } -wine_fn_pot_rules () -{ - test "x$with_gettextpo" = xyes || return - - if wine_fn_has_flag mc - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule \ -"$ac_dir/msg.pot: dummy - @cd $ac_dir && \$(MAKE) msg.pot -$ac_dir/msg.pot: tools/wmc include" - fi - if wine_fn_has_flag po - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule \ -"$ac_dir/rsrc.pot: dummy - @cd $ac_dir && \$(MAKE) rsrc.pot -$ac_dir/rsrc.pot: tools/wrc include" - fi -} - wine_fn_all_rules () { wine_fn_depend_rules @@ -7610,8 +7587,6 @@ fi ac_clean= wine_fn_has_flag implib && ac_clean="$ac_clean $ac_file.$IMPLIBEXT" - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" if eval test \"x\$"$ac_enable"\" = x"no"; then : @@ -7619,7 +7594,6 @@ fi then wine_fn_depend_rules wine_fn_clean_rules $ac_clean - wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return @@ -7649,8 +7623,6 @@ $ac_dir/uninstall:: $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll" fi - - wine_fn_pot_rules fi if wine_fn_has_flag staticimplib @@ -7747,8 +7719,6 @@ wine_fn_config_program () esac ac_clean= - wine_fn_has_flag mc && ac_clean="$ac_clean $ac_dir/msg.pot" - wine_fn_has_flag po && ac_clean="$ac_clean $ac_dir/rsrc.pot" wine_fn_has_flag manpage && ac_clean="$ac_clean $ac_dir/$ac_name.man" test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_program" @@ -7759,7 +7729,6 @@ fi wine_fn_all_rules wine_fn_clean_rules $ac_clean wine_fn_append_rule "$ac_dir: __builddeps__" - wine_fn_pot_rules wine_fn_has_flag install || return wine_fn_append_rule \ @@ -12526,7 +12495,9 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h fi fi - test "x$with_gettextpo" != xyes || if test "x$GETTEXTPO_LIBS" = "x"; then : + if test "x$with_gettextpo" = xyes + then + if test "x$GETTEXTPO_LIBS" = "x"; then : case "x$with_gettextpo" in x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; xno) ;; @@ -12534,6 +12505,15 @@ fi This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi + if test "$srcdir" != .; then : + case "x$with_gettextpo" in + x) as_fn_append wine_notices "|Rebuilding po files is not supported for out of tree builds." ;; + xno) ;; + *) as_fn_error $? "Rebuilding po files is not supported for out of tree builds. +This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; +esac +fi + fi fi if test "x$with_pulse" != "xno"; @@ -17438,7 +17418,7 @@ wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_servic wine_fn_config_dll api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test -wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po +wine_fn_config_dll appwiz.cpl enable_appwiz_cpl clean wine_fn_config_dll atl enable_atl clean,implib wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 clean,implib @@ -17449,14 +17429,14 @@ wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll atl90 enable_atl90 clean wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib -wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po +wine_fn_config_dll avifil32 enable_avifil32 clean,implib wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib wine_fn_config_dll bcrypt enable_bcrypt implib wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll bluetoothapis enable_bluetoothapis -wine_fn_config_dll browseui enable_browseui clean,po +wine_fn_config_dll browseui enable_browseui clean wine_fn_config_test dlls/browseui/tests browseui_test wine_fn_config_dll bthprops.cpl enable_bthprops_cpl wine_fn_config_dll cabinet enable_cabinet implib @@ -17469,9 +17449,9 @@ wine_fn_config_dll combase enable_combase wine_fn_config_test dlls/combase/tests combase_test wine_fn_config_dll comcat enable_comcat wine_fn_config_test dlls/comcat/tests comcat_test -wine_fn_config_dll comctl32 enable_comctl32 implib,po +wine_fn_config_dll comctl32 enable_comctl32 clean,implib wine_fn_config_test dlls/comctl32/tests comctl32_test -wine_fn_config_dll comdlg32 enable_comdlg32 clean,implib,po +wine_fn_config_dll comdlg32 enable_comdlg32 clean,implib wine_fn_config_test dlls/comdlg32/tests comdlg32_test wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 @@ -17479,17 +17459,17 @@ wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib wine_fn_config_dll comsvcs enable_comsvcs implib wine_fn_config_dll connect enable_connect -wine_fn_config_dll credui enable_credui implib,po +wine_fn_config_dll credui enable_credui clean,implib wine_fn_config_test dlls/credui/tests credui_test wine_fn_config_dll crtdll enable_crtdll implib -wine_fn_config_dll crypt32 enable_crypt32 implib,po +wine_fn_config_dll crypt32 enable_crypt32 clean,implib wine_fn_config_test dlls/crypt32/tests crypt32_test -wine_fn_config_dll cryptdlg enable_cryptdlg po +wine_fn_config_dll cryptdlg enable_cryptdlg clean wine_fn_config_dll cryptdll enable_cryptdll implib wine_fn_config_dll cryptext enable_cryptext wine_fn_config_dll cryptnet enable_cryptnet implib wine_fn_config_test dlls/cryptnet/tests cryptnet_test -wine_fn_config_dll cryptui enable_cryptui implib,po +wine_fn_config_dll cryptui enable_cryptui clean,implib wine_fn_config_test dlls/cryptui/tests cryptui_test wine_fn_config_dll ctapi32 enable_ctapi32 wine_fn_config_dll ctl3d.dll16 enable_win16 @@ -17571,11 +17551,11 @@ wine_fn_config_dll ddraw enable_ddraw clean,implib wine_fn_config_test dlls/ddraw/tests ddraw_test wine_fn_config_dll ddrawex enable_ddrawex clean wine_fn_config_test dlls/ddrawex/tests ddrawex_test -wine_fn_config_dll devenum enable_devenum clean,po +wine_fn_config_dll devenum enable_devenum clean wine_fn_config_test dlls/devenum/tests devenum_test wine_fn_config_dll dhcpcsvc enable_dhcpcsvc wine_fn_config_dll difxapi enable_difxapi -wine_fn_config_dll dinput enable_dinput clean,implib,po,staticimplib +wine_fn_config_dll dinput enable_dinput clean,implib,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 clean,implib wine_fn_config_test dlls/dinput8/tests dinput8_test @@ -17623,7 +17603,7 @@ wine_fn_config_test dlls/dswave/tests dswave_test wine_fn_config_dll dwmapi enable_dwmapi implib wine_fn_config_dll dwrite enable_dwrite implib wine_fn_config_test dlls/dwrite/tests dwrite_test -wine_fn_config_dll dxdiagn enable_dxdiagn clean,po +wine_fn_config_dll dxdiagn enable_dxdiagn clean wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 wine_fn_config_lib dxerr9 @@ -17648,24 +17628,24 @@ wine_fn_config_dll fwpuclnt enable_fwpuclnt wine_fn_config_dll gameux enable_gameux clean wine_fn_config_test dlls/gameux/tests gameux_test wine_fn_config_dll gdi.exe16 enable_win16 -wine_fn_config_dll gdi32 enable_gdi32 clean,implib,po +wine_fn_config_dll gdi32 enable_gdi32 clean,implib wine_fn_config_test dlls/gdi32/tests gdi32_test wine_fn_config_dll gdiplus enable_gdiplus implib wine_fn_config_test dlls/gdiplus/tests gdiplus_test wine_fn_config_dll glu32 enable_glu32 implib -wine_fn_config_dll gphoto2.ds enable_gphoto2_ds po +wine_fn_config_dll gphoto2.ds enable_gphoto2_ds clean wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal -wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx clean,implib,po htmlhelp +wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx clean,implib htmlhelp wine_fn_config_dll hid enable_hid implib wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean wine_fn_config_dll httpapi enable_httpapi -wine_fn_config_dll iccvid enable_iccvid po +wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp -wine_fn_config_dll ieframe enable_ieframe clean,implib,po +wine_fn_config_dll ieframe enable_ieframe clean,implib wine_fn_config_test dlls/ieframe/tests ieframe_test wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm @@ -17676,7 +17656,7 @@ wine_fn_config_dll imm32 enable_imm32 implib wine_fn_config_test dlls/imm32/tests imm32_test wine_fn_config_dll inetcomm enable_inetcomm clean,implib wine_fn_config_test dlls/inetcomm/tests inetcomm_test -wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl po +wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl clean wine_fn_config_dll inetmib1 enable_inetmib1 wine_fn_config_test dlls/inetmib1/tests inetmib1_test wine_fn_config_dll infosoft enable_infosoft clean @@ -17690,25 +17670,25 @@ wine_fn_config_dll irprops.cpl enable_irprops_cpl wine_fn_config_dll itircl enable_itircl wine_fn_config_dll itss enable_itss clean wine_fn_config_test dlls/itss/tests itss_test -wine_fn_config_dll joy.cpl enable_joy_cpl po -wine_fn_config_dll jscript enable_jscript clean,po +wine_fn_config_dll joy.cpl enable_joy_cpl clean +wine_fn_config_dll jscript enable_jscript clean wine_fn_config_test dlls/jscript/tests jscript_test wine_fn_config_dll jsproxy enable_jsproxy implib -wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc +wine_fn_config_dll kernel32 enable_kernel32 clean,implib wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel wine_fn_config_dll ksuser enable_ksuser wine_fn_config_dll ktmw32 enable_ktmw32 wine_fn_config_dll loadperf enable_loadperf implib -wine_fn_config_dll localspl enable_localspl po +wine_fn_config_dll localspl enable_localspl clean wine_fn_config_test dlls/localspl/tests localspl_test -wine_fn_config_dll localui enable_localui po +wine_fn_config_dll localui enable_localui clean wine_fn_config_test dlls/localui/tests localui_test wine_fn_config_dll lz32 enable_lz32 implib wine_fn_config_test dlls/lz32/tests lz32_test wine_fn_config_dll lzexpand.dll16 enable_win16 -wine_fn_config_dll mapi32 enable_mapi32 implib,po +wine_fn_config_dll mapi32 enable_mapi32 clean,implib wine_fn_config_test dlls/mapi32/tests mapi32_test wine_fn_config_dll mapistub enable_mapistub wine_fn_config_dll mciavi32 enable_mciavi32 @@ -17732,12 +17712,12 @@ wine_fn_config_dll mmsystem.dll16 enable_win16 wine_fn_config_dll monodebg.vxd enable_win16 wine_fn_config_dll mountmgr.sys enable_mountmgr_sys wine_fn_config_dll mouse.drv16 enable_win16 -wine_fn_config_dll mpr enable_mpr implib,po +wine_fn_config_dll mpr enable_mpr clean,implib wine_fn_config_test dlls/mpr/tests mpr_test wine_fn_config_dll mprapi enable_mprapi implib wine_fn_config_dll msacm.dll16 enable_win16 wine_fn_config_dll msacm32.drv enable_msacm32_drv -wine_fn_config_dll msacm32 enable_msacm32 implib,po +wine_fn_config_dll msacm32 enable_msacm32 clean,implib wine_fn_config_test dlls/msacm32/tests msacm32_test wine_fn_config_dll msadp32.acm enable_msadp32_acm wine_fn_config_dll msasn1 enable_msasn1 implib @@ -17758,9 +17738,9 @@ wine_fn_config_dll msftedit enable_msftedit wine_fn_config_dll msg711.acm enable_msg711_acm wine_fn_config_dll msgsm32.acm enable_msgsm32_acm wine_fn_config_dll mshtml.tlb enable_mshtml_tlb clean -wine_fn_config_dll mshtml enable_mshtml clean,implib,po +wine_fn_config_dll mshtml enable_mshtml clean,implib wine_fn_config_test dlls/mshtml/tests mshtml_test clean -wine_fn_config_dll msi enable_msi clean,implib,po +wine_fn_config_dll msi enable_msi clean,implib wine_fn_config_test dlls/msi/tests msi_test wine_fn_config_dll msident enable_msident clean wine_fn_config_dll msimg32 enable_msimg32 implib @@ -17771,7 +17751,7 @@ wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha implib -wine_fn_config_dll msrle32 enable_msrle32 po +wine_fn_config_dll msrle32 enable_msrle32 clean wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll msscript.ocx enable_msscript_ocx clean wine_fn_config_dll mssign32 enable_mssign32 @@ -17813,9 +17793,9 @@ wine_fn_config_dll msvcrt20 enable_msvcrt20 implib wine_fn_config_dll msvcrt40 enable_msvcrt40 implib wine_fn_config_dll msvcrtd enable_msvcrtd implib wine_fn_config_test dlls/msvcrtd/tests msvcrtd_test -wine_fn_config_dll msvfw32 enable_msvfw32 implib,po +wine_fn_config_dll msvfw32 enable_msvfw32 clean,implib wine_fn_config_test dlls/msvfw32/tests msvfw32_test -wine_fn_config_dll msvidc32 enable_msvidc32 po +wine_fn_config_dll msvidc32 enable_msvidc32 clean wine_fn_config_dll msvideo.dll16 enable_win16 wine_fn_config_dll mswsock enable_mswsock implib wine_fn_config_dll msxml enable_msxml clean @@ -17856,15 +17836,15 @@ wine_fn_config_dll ole2prox.dll16 enable_win16 wine_fn_config_dll ole2thk.dll16 enable_win16 wine_fn_config_dll ole32 enable_ole32 clean,implib wine_fn_config_test dlls/ole32/tests ole32_test -wine_fn_config_dll oleacc enable_oleacc clean,implib,po +wine_fn_config_dll oleacc enable_oleacc clean,implib wine_fn_config_test dlls/oleacc/tests oleacc_test -wine_fn_config_dll oleaut32 enable_oleaut32 clean,implib,po +wine_fn_config_dll oleaut32 enable_oleaut32 clean,implib wine_fn_config_test dlls/oleaut32/tests oleaut32_test clean wine_fn_config_dll olecli.dll16 enable_win16 wine_fn_config_dll olecli32 enable_olecli32 implib wine_fn_config_dll oledb32 enable_oledb32 clean wine_fn_config_test dlls/oledb32/tests oledb32_test clean -wine_fn_config_dll oledlg enable_oledlg implib,po +wine_fn_config_dll oledlg enable_oledlg clean,implib wine_fn_config_test dlls/oledlg/tests oledlg_test wine_fn_config_dll olepro32 enable_olepro32 clean,implib wine_fn_config_dll olesvr.dll16 enable_win16 @@ -17916,7 +17896,7 @@ wine_fn_config_test dlls/rsaenh/tests rsaenh_test wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib -wine_fn_config_dll sane.ds enable_sane_ds po +wine_fn_config_dll sane.ds enable_sane_ds clean wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel @@ -17930,21 +17910,21 @@ wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security wine_fn_config_dll sensapi enable_sensapi implib -wine_fn_config_dll serialui enable_serialui implib,po +wine_fn_config_dll serialui enable_serialui clean,implib wine_fn_config_test dlls/serialui/tests serialui_test -wine_fn_config_dll setupapi enable_setupapi implib,po +wine_fn_config_dll setupapi enable_setupapi clean,implib wine_fn_config_test dlls/setupapi/tests setupapi_test wine_fn_config_dll setupx.dll16 enable_win16 wine_fn_config_dll sfc enable_sfc implib wine_fn_config_dll sfc_os enable_sfc_os implib -wine_fn_config_dll shdoclc enable_shdoclc po +wine_fn_config_dll shdoclc enable_shdoclc clean wine_fn_config_dll shdocvw enable_shdocvw clean,implib wine_fn_config_test dlls/shdocvw/tests shdocvw_test wine_fn_config_dll shell.dll16 enable_win16 -wine_fn_config_dll shell32 enable_shell32 clean,implib,po +wine_fn_config_dll shell32 enable_shell32 clean,implib wine_fn_config_test dlls/shell32/tests shell32_test wine_fn_config_dll shfolder enable_shfolder implib -wine_fn_config_dll shlwapi enable_shlwapi implib,po +wine_fn_config_dll shlwapi enable_shlwapi clean,implib wine_fn_config_test dlls/shlwapi/tests shlwapi_test wine_fn_config_dll slbcsp enable_slbcsp wine_fn_config_dll slc enable_slc implib @@ -17983,11 +17963,11 @@ wine_fn_config_test dlls/ucrtbase/tests ucrtbase_test wine_fn_config_dll unicows enable_unicows implib wine_fn_config_dll updspapi enable_updspapi wine_fn_config_dll url enable_url implib -wine_fn_config_dll urlmon enable_urlmon clean,implib,po +wine_fn_config_dll urlmon enable_urlmon clean,implib wine_fn_config_test dlls/urlmon/tests urlmon_test wine_fn_config_dll usbd.sys enable_usbd_sys implib wine_fn_config_dll user.exe16 enable_win16 -wine_fn_config_dll user32 enable_user32 clean,implib,po +wine_fn_config_dll user32 enable_user32 clean,implib wine_fn_config_test dlls/user32/tests user32_test wine_fn_config_dll userenv enable_userenv implib wine_fn_config_test dlls/userenv/tests userenv_test @@ -18044,11 +18024,11 @@ wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winejoystick.drv enable_winejoystick_drv -wine_fn_config_dll winemac.drv enable_winemac_drv po +wine_fn_config_dll winemac.drv enable_winemac_drv clean wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv -wine_fn_config_dll wineps.drv enable_wineps_drv clean,po +wine_fn_config_dll wineps.drv enable_wineps_drv clean wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll winepulse.drv enable_winepulse_drv wine_fn_config_dll wineqtdecoder enable_wineqtdecoder @@ -18057,15 +18037,15 @@ wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 wine_fn_config_dll winhttp enable_winhttp clean,implib wine_fn_config_test dlls/winhttp/tests winhttp_test -wine_fn_config_dll wininet enable_wininet implib,po +wine_fn_config_dll wininet enable_wininet clean,implib wine_fn_config_test dlls/wininet/tests wininet_test -wine_fn_config_dll winmm enable_winmm implib,po +wine_fn_config_dll winmm enable_winmm clean,implib wine_fn_config_test dlls/winmm/tests winmm_test wine_fn_config_dll winnls.dll16 enable_win16 wine_fn_config_dll winnls32 enable_winnls32 implib wine_fn_config_dll winscard enable_winscard implib wine_fn_config_dll winsock.dll16 enable_win16 -wine_fn_config_dll winspool.drv enable_winspool_drv implib,po winspool +wine_fn_config_dll winspool.drv enable_winspool_drv clean,implib winspool wine_fn_config_test dlls/winspool.drv/tests winspool.drv_test wine_fn_config_dll winsta enable_winsta wine_fn_config_dll wintab.dll16 enable_win16 @@ -18074,7 +18054,7 @@ wine_fn_config_test dlls/wintab32/tests wintab32_test wine_fn_config_dll wintrust enable_wintrust implib wine_fn_config_test dlls/wintrust/tests wintrust_test wine_fn_config_dll wlanapi enable_wlanapi -wine_fn_config_dll wldap32 enable_wldap32 implib,po +wine_fn_config_dll wldap32 enable_wldap32 clean,implib wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean @@ -18139,49 +18119,49 @@ wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader clean,install-lib wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install -wine_fn_config_program attrib enable_attrib install,po +wine_fn_config_program attrib enable_attrib clean,install wine_fn_config_program cabarc enable_cabarc install wine_fn_config_program cacls enable_cacls install -wine_fn_config_program clock enable_clock install,po -wine_fn_config_program cmd enable_cmd install,po +wine_fn_config_program clock enable_clock clean,install +wine_fn_config_program cmd enable_cmd clean,install wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_program conhost enable_conhost install wine_fn_config_program control enable_control install wine_fn_config_program cscript enable_cscript clean,install wine_fn_config_program dpnsvr enable_dpnsvr install -wine_fn_config_program dxdiag enable_dxdiag install,po +wine_fn_config_program dxdiag enable_dxdiag clean,install wine_fn_config_program eject enable_eject install wine_fn_config_program expand enable_expand install -wine_fn_config_program explorer enable_explorer install,po +wine_fn_config_program explorer enable_explorer clean,install wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program findstr enable_findstr install wine_fn_config_program hh enable_hh install -wine_fn_config_program hostname enable_hostname install,po +wine_fn_config_program hostname enable_hostname clean,install wine_fn_config_program icacls enable_icacls install wine_fn_config_program icinfo enable_icinfo install wine_fn_config_program iexplore enable_iexplore install -wine_fn_config_program ipconfig enable_ipconfig install,po +wine_fn_config_program ipconfig enable_ipconfig clean,install wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mofcomp enable_mofcomp install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec install,installbin,manpage -wine_fn_config_program net enable_net install,po +wine_fn_config_program net enable_net clean,install wine_fn_config_program netsh enable_netsh install -wine_fn_config_program netstat enable_netstat install,po +wine_fn_config_program netstat enable_netstat clean,install wine_fn_config_program ngen enable_ngen install -wine_fn_config_program notepad enable_notepad install,installbin,manpage,po -wine_fn_config_program oleview enable_oleview install,po +wine_fn_config_program notepad enable_notepad clean,install,installbin,manpage +wine_fn_config_program oleview enable_oleview clean,install wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install wine_fn_config_program presentationfontcache enable_presentationfontcache install -wine_fn_config_program progman enable_progman install,po -wine_fn_config_program reg enable_reg install,po +wine_fn_config_program progman enable_progman clean,install +wine_fn_config_program reg enable_reg clean,install wine_fn_config_test programs/reg/tests reg.exe_test wine_fn_config_program regasm enable_regasm install -wine_fn_config_program regedit enable_regedit install,installbin,manpage,po +wine_fn_config_program regedit enable_regedit clean,install,installbin,manpage wine_fn_config_test programs/regedit/tests regedit.exe_test wine_fn_config_program regsvcs enable_regsvcs install -wine_fn_config_program regsvr32 enable_regsvr32 install,installbin,manpage,po +wine_fn_config_program regsvr32 enable_regsvr32 clean,install,installbin,manpage wine_fn_config_program rpcss enable_rpcss clean,install wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install @@ -18193,42 +18173,42 @@ wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services clean,install wine_fn_config_test programs/services/tests services.exe_test wine_fn_config_program spoolsv enable_spoolsv install -wine_fn_config_program start enable_start install,po +wine_fn_config_program start enable_start clean,install wine_fn_config_program svchost enable_svchost install wine_fn_config_program systeminfo enable_systeminfo install -wine_fn_config_program taskkill enable_taskkill install,po +wine_fn_config_program taskkill enable_taskkill clean,install wine_fn_config_program tasklist enable_tasklist install -wine_fn_config_program taskmgr enable_taskmgr install,po +wine_fn_config_program taskmgr enable_taskmgr clean,install wine_fn_config_program termsv enable_termsv install -wine_fn_config_program uninstaller enable_uninstaller install,po +wine_fn_config_program uninstaller enable_uninstaller clean,install wine_fn_config_program unlodctr enable_unlodctr install -wine_fn_config_program view enable_view install,po +wine_fn_config_program view enable_view clean,install wine_fn_config_program wevtutil enable_wevtutil install -wine_fn_config_program wineboot enable_wineboot install,installbin,manpage,po +wine_fn_config_program wineboot enable_wineboot clean,install,installbin,manpage wine_fn_config_program winebrowser enable_winebrowser install -wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po -wine_fn_config_program wineconsole enable_wineconsole install,installbin,manpage,po -wine_fn_config_program winedbg enable_winedbg install,installbin,manpage,po +wine_fn_config_program winecfg enable_winecfg clean,install,installbin,manpage +wine_fn_config_program wineconsole enable_wineconsole clean,install,installbin,manpage +wine_fn_config_program winedbg enable_winedbg clean,install,installbin,manpage wine_fn_config_program winedevice enable_winedevice install -wine_fn_config_program winefile enable_winefile install,installbin,manpage,po +wine_fn_config_program winefile enable_winefile clean,install,installbin,manpage wine_fn_config_program winemenubuilder enable_winemenubuilder install -wine_fn_config_program winemine enable_winemine install,installbin,manpage,po +wine_fn_config_program winemine enable_winemine clean,install,installbin,manpage wine_fn_config_program winemsibuilder enable_winemsibuilder install wine_fn_config_program winepath enable_winepath install,installbin,manpage wine_fn_config_program winetest enable_winetest clean wine_fn_config_program winevdm enable_win16 install wine_fn_config_program winhelp.exe16 enable_win16 install -wine_fn_config_program winhlp32 enable_winhlp32 install,po +wine_fn_config_program winhlp32 enable_winhlp32 clean,install wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install -wine_fn_config_program wmic enable_wmic install,po +wine_fn_config_program wmic enable_wmic clean,install wine_fn_config_program wmplayer enable_wmplayer install -wine_fn_config_program wordpad enable_wordpad install,po -wine_fn_config_program write enable_write install,po +wine_fn_config_program wordpad enable_wordpad clean,install +wine_fn_config_program write enable_write clean,install wine_fn_config_program wscript enable_wscript clean,install wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install -wine_fn_config_program xcopy enable_xcopy install,po +wine_fn_config_program xcopy enable_xcopy clean,install wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib wine_fn_config_tool tools clean @@ -18328,16 +18308,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -if test "x$with_gettextpo" = xyes -then - test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 - wine_fn_append_rule "ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=po/%.po): po/wine.pot - msgmerge --previous -q \$@ po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ -po/wine.pot: \$(ALL_POT_FILES) - msgcat -o \$@ \$(ALL_POT_FILES)" -fi - if test "$MSGFMT" != false then wine_fn_append_rule "__builddeps__: \$(LINGUAS:%=po/%.mo) diff --git a/configure.ac b/configure.ac index 2ebbb1079f8..288224c964e 100644 --- a/configure.ac +++ b/configure.ac @@ -1443,8 +1443,13 @@ then [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")]) fi - test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], + if test "x$with_gettextpo" = xyes + then + WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) + WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], + [Rebuilding po files is not supported for out of tree builds.]) + fi fi dnl **** Check for PulseAudio **** @@ -2743,7 +2748,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) -WINE_CONFIG_DLL(appwiz.cpl,,[po]) +WINE_CONFIG_DLL(appwiz.cpl,,[clean]) WINE_CONFIG_DLL(atl,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[clean,implib]) @@ -2754,14 +2759,14 @@ WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(atl90,,[clean]) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) -WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) +WINE_CONFIG_DLL(avifil32,,[clean,implib]) WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) WINE_CONFIG_DLL(bcrypt,,[implib]) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(bluetoothapis) -WINE_CONFIG_DLL(browseui,,[clean,po]) +WINE_CONFIG_DLL(browseui,,[clean]) WINE_CONFIG_TEST(dlls/browseui/tests) WINE_CONFIG_DLL(bthprops.cpl) WINE_CONFIG_DLL(cabinet,,[implib]) @@ -2774,9 +2779,9 @@ WINE_CONFIG_DLL(combase) WINE_CONFIG_TEST(dlls/combase/tests) WINE_CONFIG_DLL(comcat) WINE_CONFIG_TEST(dlls/comcat/tests) -WINE_CONFIG_DLL(comctl32,,[implib,po]) +WINE_CONFIG_DLL(comctl32,,[clean,implib]) WINE_CONFIG_TEST(dlls/comctl32/tests) -WINE_CONFIG_DLL(comdlg32,,[clean,implib,po]) +WINE_CONFIG_DLL(comdlg32,,[clean,implib]) WINE_CONFIG_TEST(dlls/comdlg32/tests) WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) @@ -2784,17 +2789,17 @@ WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) WINE_CONFIG_DLL(comsvcs,,[implib]) WINE_CONFIG_DLL(connect) -WINE_CONFIG_DLL(credui,,[implib,po]) +WINE_CONFIG_DLL(credui,,[clean,implib]) WINE_CONFIG_TEST(dlls/credui/tests) WINE_CONFIG_DLL(crtdll,,[implib]) -WINE_CONFIG_DLL(crypt32,,[implib,po]) +WINE_CONFIG_DLL(crypt32,,[clean,implib]) WINE_CONFIG_TEST(dlls/crypt32/tests) -WINE_CONFIG_DLL(cryptdlg,,[po]) +WINE_CONFIG_DLL(cryptdlg,,[clean]) WINE_CONFIG_DLL(cryptdll,,[implib]) WINE_CONFIG_DLL(cryptext) WINE_CONFIG_DLL(cryptnet,,[implib]) WINE_CONFIG_TEST(dlls/cryptnet/tests) -WINE_CONFIG_DLL(cryptui,,[implib,po]) +WINE_CONFIG_DLL(cryptui,,[clean,implib]) WINE_CONFIG_TEST(dlls/cryptui/tests) WINE_CONFIG_DLL(ctapi32) WINE_CONFIG_DLL(ctl3d.dll16,enable_win16) @@ -2876,11 +2881,11 @@ WINE_CONFIG_DLL(ddraw,,[clean,implib]) WINE_CONFIG_TEST(dlls/ddraw/tests) WINE_CONFIG_DLL(ddrawex,,[clean]) WINE_CONFIG_TEST(dlls/ddrawex/tests) -WINE_CONFIG_DLL(devenum,,[clean,po]) +WINE_CONFIG_DLL(devenum,,[clean]) WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) WINE_CONFIG_DLL(difxapi) -WINE_CONFIG_DLL(dinput,,[clean,implib,po,staticimplib]) +WINE_CONFIG_DLL(dinput,,[clean,implib,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[clean,implib]) WINE_CONFIG_TEST(dlls/dinput8/tests) @@ -2928,7 +2933,7 @@ WINE_CONFIG_TEST(dlls/dswave/tests) WINE_CONFIG_DLL(dwmapi,,[implib]) WINE_CONFIG_DLL(dwrite,,[implib]) WINE_CONFIG_TEST(dlls/dwrite/tests) -WINE_CONFIG_DLL(dxdiagn,,[clean,po]) +WINE_CONFIG_DLL(dxdiagn,,[clean]) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) WINE_CONFIG_LIB(dxerr9) @@ -2953,24 +2958,24 @@ WINE_CONFIG_DLL(fwpuclnt) WINE_CONFIG_DLL(gameux,,[clean]) WINE_CONFIG_TEST(dlls/gameux/tests) WINE_CONFIG_DLL(gdi.exe16,enable_win16) -WINE_CONFIG_DLL(gdi32,,[clean,implib,po]) +WINE_CONFIG_DLL(gdi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/gdi32/tests) WINE_CONFIG_DLL(gdiplus,,[implib]) WINE_CONFIG_TEST(dlls/gdiplus/tests) WINE_CONFIG_DLL(glu32,,[implib]) -WINE_CONFIG_DLL(gphoto2.ds,,[po]) +WINE_CONFIG_DLL(gphoto2.ds,,[clean]) WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) -WINE_CONFIG_DLL(hhctrl.ocx,,[clean,implib,po],[htmlhelp]) +WINE_CONFIG_DLL(hhctrl.ocx,,[clean,implib],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) WINE_CONFIG_DLL(httpapi) -WINE_CONFIG_DLL(iccvid,,[po]) +WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) -WINE_CONFIG_DLL(ieframe,,[clean,implib,po]) +WINE_CONFIG_DLL(ieframe,,[clean,implib]) WINE_CONFIG_TEST(dlls/ieframe/tests) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) @@ -2981,7 +2986,7 @@ WINE_CONFIG_DLL(imm32,,[implib]) WINE_CONFIG_TEST(dlls/imm32/tests) WINE_CONFIG_DLL(inetcomm,,[clean,implib]) WINE_CONFIG_TEST(dlls/inetcomm/tests) -WINE_CONFIG_DLL(inetcpl.cpl,,[po]) +WINE_CONFIG_DLL(inetcpl.cpl,,[clean]) WINE_CONFIG_DLL(inetmib1) WINE_CONFIG_TEST(dlls/inetmib1/tests) WINE_CONFIG_DLL(infosoft,,[clean]) @@ -2995,25 +3000,25 @@ WINE_CONFIG_DLL(irprops.cpl) WINE_CONFIG_DLL(itircl) WINE_CONFIG_DLL(itss,,[clean]) WINE_CONFIG_TEST(dlls/itss/tests) -WINE_CONFIG_DLL(joy.cpl,,[po]) -WINE_CONFIG_DLL(jscript,,[clean,po]) +WINE_CONFIG_DLL(joy.cpl,,[clean]) +WINE_CONFIG_DLL(jscript,,[clean]) WINE_CONFIG_TEST(dlls/jscript/tests) WINE_CONFIG_DLL(jsproxy,,[implib]) -WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) +WINE_CONFIG_DLL(kernel32,,[clean,implib]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) WINE_CONFIG_DLL(ksuser) WINE_CONFIG_DLL(ktmw32) WINE_CONFIG_DLL(loadperf,,[implib]) -WINE_CONFIG_DLL(localspl,,[po]) +WINE_CONFIG_DLL(localspl,,[clean]) WINE_CONFIG_TEST(dlls/localspl/tests) -WINE_CONFIG_DLL(localui,,[po]) +WINE_CONFIG_DLL(localui,,[clean]) WINE_CONFIG_TEST(dlls/localui/tests) WINE_CONFIG_DLL(lz32,,[implib]) WINE_CONFIG_TEST(dlls/lz32/tests) WINE_CONFIG_DLL(lzexpand.dll16,enable_win16) -WINE_CONFIG_DLL(mapi32,,[implib,po]) +WINE_CONFIG_DLL(mapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/mapi32/tests) WINE_CONFIG_DLL(mapistub) WINE_CONFIG_DLL(mciavi32) @@ -3037,12 +3042,12 @@ WINE_CONFIG_DLL(mmsystem.dll16,enable_win16) WINE_CONFIG_DLL(monodebg.vxd,enable_win16) WINE_CONFIG_DLL(mountmgr.sys) WINE_CONFIG_DLL(mouse.drv16,enable_win16) -WINE_CONFIG_DLL(mpr,,[implib,po]) +WINE_CONFIG_DLL(mpr,,[clean,implib]) WINE_CONFIG_TEST(dlls/mpr/tests) WINE_CONFIG_DLL(mprapi,,[implib]) WINE_CONFIG_DLL(msacm.dll16,enable_win16) WINE_CONFIG_DLL(msacm32.drv) -WINE_CONFIG_DLL(msacm32,,[implib,po]) +WINE_CONFIG_DLL(msacm32,,[clean,implib]) WINE_CONFIG_TEST(dlls/msacm32/tests) WINE_CONFIG_DLL(msadp32.acm) WINE_CONFIG_DLL(msasn1,,[implib]) @@ -3063,9 +3068,9 @@ WINE_CONFIG_DLL(msftedit) WINE_CONFIG_DLL(msg711.acm) WINE_CONFIG_DLL(msgsm32.acm) WINE_CONFIG_DLL(mshtml.tlb,,[clean]) -WINE_CONFIG_DLL(mshtml,,[clean,implib,po]) +WINE_CONFIG_DLL(mshtml,,[clean,implib]) WINE_CONFIG_TEST(dlls/mshtml/tests,[clean]) -WINE_CONFIG_DLL(msi,,[clean,implib,po]) +WINE_CONFIG_DLL(msi,,[clean,implib]) WINE_CONFIG_TEST(dlls/msi/tests) WINE_CONFIG_DLL(msident,,[clean]) WINE_CONFIG_DLL(msimg32,,[implib]) @@ -3076,7 +3081,7 @@ WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha,,[implib]) -WINE_CONFIG_DLL(msrle32,,[po]) +WINE_CONFIG_DLL(msrle32,,[clean]) WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(msscript.ocx,,[clean]) WINE_CONFIG_DLL(mssign32) @@ -3118,9 +3123,9 @@ WINE_CONFIG_DLL(msvcrt20,,[implib]) WINE_CONFIG_DLL(msvcrt40,,[implib]) WINE_CONFIG_DLL(msvcrtd,,[implib]) WINE_CONFIG_TEST(dlls/msvcrtd/tests) -WINE_CONFIG_DLL(msvfw32,,[implib,po]) +WINE_CONFIG_DLL(msvfw32,,[clean,implib]) WINE_CONFIG_TEST(dlls/msvfw32/tests) -WINE_CONFIG_DLL(msvidc32,,[po]) +WINE_CONFIG_DLL(msvidc32,,[clean]) WINE_CONFIG_DLL(msvideo.dll16,enable_win16) WINE_CONFIG_DLL(mswsock,,[implib]) WINE_CONFIG_DLL(msxml,,[clean]) @@ -3161,15 +3166,15 @@ WINE_CONFIG_DLL(ole2prox.dll16,enable_win16) WINE_CONFIG_DLL(ole2thk.dll16,enable_win16) WINE_CONFIG_DLL(ole32,,[clean,implib]) WINE_CONFIG_TEST(dlls/ole32/tests) -WINE_CONFIG_DLL(oleacc,,[clean,implib,po]) +WINE_CONFIG_DLL(oleacc,,[clean,implib]) WINE_CONFIG_TEST(dlls/oleacc/tests) -WINE_CONFIG_DLL(oleaut32,,[clean,implib,po]) +WINE_CONFIG_DLL(oleaut32,,[clean,implib]) WINE_CONFIG_TEST(dlls/oleaut32/tests,[clean]) WINE_CONFIG_DLL(olecli.dll16,enable_win16) WINE_CONFIG_DLL(olecli32,,[implib]) WINE_CONFIG_DLL(oledb32,,[clean]) WINE_CONFIG_TEST(dlls/oledb32/tests,[clean]) -WINE_CONFIG_DLL(oledlg,,[implib,po]) +WINE_CONFIG_DLL(oledlg,,[clean,implib]) WINE_CONFIG_TEST(dlls/oledlg/tests) WINE_CONFIG_DLL(olepro32,,[clean,implib]) WINE_CONFIG_DLL(olesvr.dll16,enable_win16) @@ -3221,7 +3226,7 @@ WINE_CONFIG_TEST(dlls/rsaenh/tests) WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) -WINE_CONFIG_DLL(sane.ds,,[po]) +WINE_CONFIG_DLL(sane.ds,,[clean]) WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) @@ -3235,21 +3240,21 @@ WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) WINE_CONFIG_DLL(sensapi,,[implib]) -WINE_CONFIG_DLL(serialui,,[implib,po]) +WINE_CONFIG_DLL(serialui,,[clean,implib]) WINE_CONFIG_TEST(dlls/serialui/tests) -WINE_CONFIG_DLL(setupapi,,[implib,po]) +WINE_CONFIG_DLL(setupapi,,[clean,implib]) WINE_CONFIG_TEST(dlls/setupapi/tests) WINE_CONFIG_DLL(setupx.dll16,enable_win16) WINE_CONFIG_DLL(sfc,,[implib]) WINE_CONFIG_DLL(sfc_os,,[implib]) -WINE_CONFIG_DLL(shdoclc,,[po]) +WINE_CONFIG_DLL(shdoclc,,[clean]) WINE_CONFIG_DLL(shdocvw,,[clean,implib]) WINE_CONFIG_TEST(dlls/shdocvw/tests) WINE_CONFIG_DLL(shell.dll16,enable_win16) -WINE_CONFIG_DLL(shell32,,[clean,implib,po]) +WINE_CONFIG_DLL(shell32,,[clean,implib]) WINE_CONFIG_TEST(dlls/shell32/tests) WINE_CONFIG_DLL(shfolder,,[implib]) -WINE_CONFIG_DLL(shlwapi,,[implib,po]) +WINE_CONFIG_DLL(shlwapi,,[clean,implib]) WINE_CONFIG_TEST(dlls/shlwapi/tests) WINE_CONFIG_DLL(slbcsp) WINE_CONFIG_DLL(slc,,[implib]) @@ -3288,11 +3293,11 @@ WINE_CONFIG_TEST(dlls/ucrtbase/tests) WINE_CONFIG_DLL(unicows,,[implib]) WINE_CONFIG_DLL(updspapi) WINE_CONFIG_DLL(url,,[implib]) -WINE_CONFIG_DLL(urlmon,,[clean,implib,po]) +WINE_CONFIG_DLL(urlmon,,[clean,implib]) WINE_CONFIG_TEST(dlls/urlmon/tests) WINE_CONFIG_DLL(usbd.sys,,[implib]) WINE_CONFIG_DLL(user.exe16,enable_win16) -WINE_CONFIG_DLL(user32,,[clean,implib,po]) +WINE_CONFIG_DLL(user32,,[clean,implib]) WINE_CONFIG_TEST(dlls/user32/tests) WINE_CONFIG_DLL(userenv,,[implib]) WINE_CONFIG_TEST(dlls/userenv/tests) @@ -3349,11 +3354,11 @@ WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winejoystick.drv) -WINE_CONFIG_DLL(winemac.drv,,[po]) +WINE_CONFIG_DLL(winemac.drv,,[clean]) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) -WINE_CONFIG_DLL(wineps.drv,,[clean,po]) +WINE_CONFIG_DLL(wineps.drv,,[clean]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(winepulse.drv) WINE_CONFIG_DLL(wineqtdecoder) @@ -3362,15 +3367,15 @@ WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) WINE_CONFIG_DLL(winhttp,,[clean,implib]) WINE_CONFIG_TEST(dlls/winhttp/tests) -WINE_CONFIG_DLL(wininet,,[implib,po]) +WINE_CONFIG_DLL(wininet,,[clean,implib]) WINE_CONFIG_TEST(dlls/wininet/tests) -WINE_CONFIG_DLL(winmm,,[implib,po]) +WINE_CONFIG_DLL(winmm,,[clean,implib]) WINE_CONFIG_TEST(dlls/winmm/tests) WINE_CONFIG_DLL(winnls.dll16,enable_win16) WINE_CONFIG_DLL(winnls32,,[implib]) WINE_CONFIG_DLL(winscard,,[implib]) WINE_CONFIG_DLL(winsock.dll16,enable_win16) -WINE_CONFIG_DLL(winspool.drv,,[implib,po],[winspool]) +WINE_CONFIG_DLL(winspool.drv,,[clean,implib],[winspool]) WINE_CONFIG_TEST(dlls/winspool.drv/tests) WINE_CONFIG_DLL(winsta) WINE_CONFIG_DLL(wintab.dll16,enable_win16) @@ -3379,7 +3384,7 @@ WINE_CONFIG_TEST(dlls/wintab32/tests) WINE_CONFIG_DLL(wintrust,,[implib]) WINE_CONFIG_TEST(dlls/wintrust/tests) WINE_CONFIG_DLL(wlanapi) -WINE_CONFIG_DLL(wldap32,,[implib,po]) +WINE_CONFIG_DLL(wldap32,,[clean,implib]) WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) @@ -3444,49 +3449,49 @@ WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) -WINE_CONFIG_PROGRAM(attrib,,[install,po]) +WINE_CONFIG_PROGRAM(attrib,,[clean,install]) WINE_CONFIG_PROGRAM(cabarc,,[install]) WINE_CONFIG_PROGRAM(cacls,,[install]) -WINE_CONFIG_PROGRAM(clock,,[install,po]) -WINE_CONFIG_PROGRAM(cmd,,[install,po]) +WINE_CONFIG_PROGRAM(clock,,[clean,install]) +WINE_CONFIG_PROGRAM(cmd,,[clean,install]) WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(conhost,,[install]) WINE_CONFIG_PROGRAM(control,,[install]) WINE_CONFIG_PROGRAM(cscript,,[clean,install]) WINE_CONFIG_PROGRAM(dpnsvr,,[install]) -WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) +WINE_CONFIG_PROGRAM(dxdiag,,[clean,install]) WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(expand,,[install]) -WINE_CONFIG_PROGRAM(explorer,,[install,po]) +WINE_CONFIG_PROGRAM(explorer,,[clean,install]) WINE_CONFIG_PROGRAM(extrac32,,[install]) WINE_CONFIG_PROGRAM(findstr,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) -WINE_CONFIG_PROGRAM(hostname,,[install,po]) +WINE_CONFIG_PROGRAM(hostname,,[clean,install]) WINE_CONFIG_PROGRAM(icacls,,[install]) WINE_CONFIG_PROGRAM(icinfo,,[install]) WINE_CONFIG_PROGRAM(iexplore,,[install]) -WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) +WINE_CONFIG_PROGRAM(ipconfig,,[clean,install]) WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) -WINE_CONFIG_PROGRAM(net,,[install,po]) +WINE_CONFIG_PROGRAM(net,,[clean,install]) WINE_CONFIG_PROGRAM(netsh,,[install]) -WINE_CONFIG_PROGRAM(netstat,,[install,po]) +WINE_CONFIG_PROGRAM(netstat,,[clean,install]) WINE_CONFIG_PROGRAM(ngen,,[install]) -WINE_CONFIG_PROGRAM(notepad,,[install,installbin,manpage,po]) -WINE_CONFIG_PROGRAM(oleview,,[install,po]) +WINE_CONFIG_PROGRAM(notepad,,[clean,install,installbin,manpage]) +WINE_CONFIG_PROGRAM(oleview,,[clean,install]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) -WINE_CONFIG_PROGRAM(progman,,[install,po]) -WINE_CONFIG_PROGRAM(reg,,[install,po]) +WINE_CONFIG_PROGRAM(progman,,[clean,install]) +WINE_CONFIG_PROGRAM(reg,,[clean,install]) WINE_CONFIG_TEST(programs/reg/tests) WINE_CONFIG_PROGRAM(regasm,,[install]) -WINE_CONFIG_PROGRAM(regedit,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(regedit,,[clean,install,installbin,manpage]) WINE_CONFIG_TEST(programs/regedit/tests) WINE_CONFIG_PROGRAM(regsvcs,,[install]) -WINE_CONFIG_PROGRAM(regsvr32,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(regsvr32,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(rpcss,,[clean,install]) WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) @@ -3498,42 +3503,42 @@ WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[clean,install]) WINE_CONFIG_TEST(programs/services/tests) WINE_CONFIG_PROGRAM(spoolsv,,[install]) -WINE_CONFIG_PROGRAM(start,,[install,po]) +WINE_CONFIG_PROGRAM(start,,[clean,install]) WINE_CONFIG_PROGRAM(svchost,,[install]) WINE_CONFIG_PROGRAM(systeminfo,,[install]) -WINE_CONFIG_PROGRAM(taskkill,,[install,po]) +WINE_CONFIG_PROGRAM(taskkill,,[clean,install]) WINE_CONFIG_PROGRAM(tasklist,,[install]) -WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) +WINE_CONFIG_PROGRAM(taskmgr,,[clean,install]) WINE_CONFIG_PROGRAM(termsv,,[install]) -WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) +WINE_CONFIG_PROGRAM(uninstaller,,[clean,install]) WINE_CONFIG_PROGRAM(unlodctr,,[install]) -WINE_CONFIG_PROGRAM(view,,[install,po]) +WINE_CONFIG_PROGRAM(view,,[clean,install]) WINE_CONFIG_PROGRAM(wevtutil,,[install]) -WINE_CONFIG_PROGRAM(wineboot,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(wineboot,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(winebrowser,,[install]) -WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,manpage,po]) -WINE_CONFIG_PROGRAM(wineconsole,,[install,installbin,manpage,po]) -WINE_CONFIG_PROGRAM(winedbg,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(winecfg,,[clean,install,installbin,manpage]) +WINE_CONFIG_PROGRAM(wineconsole,,[clean,install,installbin,manpage]) +WINE_CONFIG_PROGRAM(winedbg,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(winedevice,,[install]) -WINE_CONFIG_PROGRAM(winefile,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(winefile,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) -WINE_CONFIG_PROGRAM(winemine,,[install,installbin,manpage,po]) +WINE_CONFIG_PROGRAM(winemine,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) WINE_CONFIG_PROGRAM(winepath,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(winetest,,[clean]) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install]) -WINE_CONFIG_PROGRAM(winhlp32,,[install,po]) +WINE_CONFIG_PROGRAM(winhlp32,,[clean,install]) WINE_CONFIG_PROGRAM(winoldap.mod16,enable_win16,[install]) WINE_CONFIG_PROGRAM(winver,,[install]) -WINE_CONFIG_PROGRAM(wmic,,[install,po]) +WINE_CONFIG_PROGRAM(wmic,,[clean,install]) WINE_CONFIG_PROGRAM(wmplayer,,[install]) -WINE_CONFIG_PROGRAM(wordpad,,[install,po]) -WINE_CONFIG_PROGRAM(write,,[install,po]) +WINE_CONFIG_PROGRAM(wordpad,,[clean,install]) +WINE_CONFIG_PROGRAM(write,,[clean,install]) WINE_CONFIG_PROGRAM(wscript,,[clean,install]) WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) -WINE_CONFIG_PROGRAM(xcopy,,[install,po]) +WINE_CONFIG_PROGRAM(xcopy,,[clean,install]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib]) WINE_CONFIG_TOOL(tools,[clean]) @@ -3645,17 +3650,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -if test "x$with_gettextpo" = xyes -then - test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.]) - WINE_APPEND_RULE( -[ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=po/%.po): po/wine.pot - msgmerge --previous -q \$[@] po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@] -po/wine.pot: \$(ALL_POT_FILES) - msgcat -o \$[@] \$(ALL_POT_FILES)]) -fi - if test "$MSGFMT" != false then WINE_APPEND_RULE( diff --git a/tools/make_makefiles b/tools/make_makefiles index e65429f60ff..ce38c5315b6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -380,13 +380,13 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /\.rc$/) { - ${${$make}{"=flags"}}{"po"} = 1 if defined $flags{"po"}; + ${${$make}{"=flags"}}{"clean"} = 1 if defined $flags{"po"}; push @{${$make}{"=RC_SRCS"}}, $name; } elsif ($name =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $name; - ${${$make}{"=flags"}}{"mc"} = 1; + ${${$make}{"=flags"}}{"clean"} = 1; } elsif ($name =~ /\.idl$/) { diff --git a/tools/makedep.c b/tools/makedep.c index 9da665a6518..4264b5e1031 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2141,6 +2141,57 @@ static struct strarray output_install_rules( const struct makefile *make, struct } +/******************************************************************* + * output_po_files + */ +static void output_po_files( const struct makefile *make ) +{ + const char *po_dir = src_dir_path( make, "po" ); + struct strarray pot_files = empty_strarray; + struct incl_file *source; + unsigned int i; + + for (i = 0; i < make->subdirs.count; i++) + { + struct makefile *submake = make->submakes[i]; + + LIST_FOR_EACH_ENTRY( source, &submake->sources, struct incl_file, entry ) + { + if (strendswith( source->name, ".rc" ) && (source->file->flags & FLAG_RC_PO)) + { + char *pot_file = replace_extension( source->name, ".rc", ".pot" ); + char *pot_path = base_dir_path( submake, pot_file ); + output( "%s: tools/wrc include dummy\n", pot_path ); + output( "\t@cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); + strarray_add( &pot_files, pot_path ); + } + else if (strendswith( source->name, ".mc" )) + { + char *pot_file = replace_extension( source->name, ".mc", ".pot" ); + char *pot_path = base_dir_path( submake, pot_file ); + output( "%s: tools/wmc include dummy\n", pot_path ); + output( "\t@cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); + strarray_add( &pot_files, pot_path ); + } + } + } + if (linguas.count) + { + for (i = 0; i < linguas.count; i++) + output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); + output( ": %s/wine.pot\n", po_dir ); + output( "\tmsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", + po_dir ); + } + output( "%s/wine.pot:", po_dir ); + output_filenames( pot_files ); + output( "\n" ); + output( "\tmsgcat -o $@" ); + output_filenames( pot_files ); + output( "\n" ); +} + + /******************************************************************* * output_sources */ @@ -2153,9 +2204,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray res_files = empty_strarray; struct strarray clean_files = empty_strarray; struct strarray uninstall_files = empty_strarray; - struct strarray po_files = empty_strarray; struct strarray mo_files = empty_strarray; - struct strarray mc_files = empty_strarray; struct strarray ok_files = empty_strarray; struct strarray in_files = empty_strarray; struct strarray dlldata_files = empty_strarray; @@ -2246,8 +2295,7 @@ static struct strarray output_sources( const struct makefile *make ) else if (!strcmp( ext, "rc" )) /* resource file */ { strarray_add( &res_files, strmake( "%s.res", obj )); - output( "%s.res: %s %s\n", obj_dir_path( make, obj ), - tools_path( make, "wrc" ), source->filename ); + output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); @@ -2257,42 +2305,57 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( extradefs ); if (mo_files.count && (source->file->flags & FLAG_RC_PO)) { - strarray_add( &po_files, source->filename ); output_filename( strmake( "--po-dir=%s", top_obj_dir_path( make, "po" ))); output_filename( source->filename ); output( "\n" ); output( "%s.res:", obj_dir_path( make, obj )); output_filenames( mo_files ); output( "\n" ); - output( "%s ", obj_dir_path( make, "rsrc.pot" )); } else { output_filename( source->filename ); output( "\n" ); } + if (source->file->flags & FLAG_RC_PO) + { + strarray_add( &clean_files, strmake( "%s.pot", obj )); + output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t%s -O pot -o $@", tools_path( make, "wrc" ) ); + if (make->is_win16) output_filename( "-m16" ); + else output_filenames( target_flags ); + output_filename( "--nostdinc" ); + output_filenames( includes ); + output_filenames( make->define_args ); + output_filenames( extradefs ); + output_filename( source->filename ); + output( "\n" ); + output( "%s.pot ", obj_dir_path( make, obj )); + } output( "%s.res:", obj_dir_path( make, obj )); + output_filename( tools_path( make, "wrc" )); output_filenames( dependencies ); output( "\n" ); } else if (!strcmp( ext, "mc" )) /* message file */ { strarray_add( &res_files, strmake( "%s.res", obj )); - output( "%s.res: %s %s\n", obj_dir_path( make, obj ), - tools_path( make, "wmc" ), source->filename ); + strarray_add( &clean_files, strmake( "%s.pot", obj )); + output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); if (mo_files.count) { - strarray_add( &mc_files, source->filename ); output_filename( strmake( "--po-dir=%s", top_obj_dir_path( make, "po" ))); output( "\n" ); output( "%s.res:", obj_dir_path( make, obj )); output_filenames( mo_files ); - output( "\n" ); - output( "%s ", obj_dir_path( make, "msg.pot" )); } - else output( "\n" ); - output( "%s.res:", obj_dir_path( make, obj )); + output( "\n" ); + output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t%s -O pot -o $@ %s", tools_path( make, "wmc" ), source->filename ); + output( "\n" ); + output( "%s.pot %s.res:", obj_dir_path( make, obj ), obj_dir_path( make, obj )); + output_filename( tools_path( make, "wmc" )); output_filenames( dependencies ); output( "\n" ); } @@ -2497,33 +2560,6 @@ static struct strarray output_sources( const struct makefile *make ) /* rules for files that depend on multiple sources */ - if (po_files.count) - { - output( "%s: %s", obj_dir_path( make, "rsrc.pot" ), tools_path( make, "wrc" ) ); - output_filenames( po_files ); - output( "\n" ); - output( "\t%s -O pot -o $@", tools_path( make, "wrc" )); - if (make->is_win16) output_filename( "-m16" ); - else output_filenames( target_flags ); - output_filename( "--nostdinc" ); - output_filenames( includes ); - output_filenames( make->define_args ); - output_filenames( po_files ); - output( "\n" ); - strarray_add( &clean_files, "rsrc.pot" ); - } - - if (mc_files.count) - { - output( "%s: %s", obj_dir_path( make, "msg.pot" ), tools_path( make, "wmc" )); - output_filenames( mc_files ); - output( "\n" ); - output( "\t%s -O pot -o $@", tools_path( make, "wmc" )); - output_filenames( mc_files ); - output( "\n" ); - strarray_add( &clean_files, "msg.pot" ); - } - if (dlldata_files.count) { output( "%s: %s %s\n", obj_dir_path( make, "dlldata.c" ), @@ -2984,6 +3020,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( distclean_files ); output( "\n" ); strarray_add( &phony_targets, "distclean" ); + + if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); } if (phony_targets.count)