Skip to content

W
wine-winehq
Commit 4e9f1a41 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Always use the global SOURCES variable for .man.in files.

parent 9d78031d
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 131 deletions
programs/msiexec/Makefile.in
View file @ 4e9f1a41
...@@ -3,12 +3,9 @@ IMPORTS = msi ole32 advapi32 user32 comctl32 ...@@ -3,12 +3,9 @@ IMPORTS = msi ole32 advapi32 user32 comctl32
EXTRADLLFLAGS = -mwindows EXTRADLLFLAGS = -mwindows
C_SRCS = \ SOURCES = \
msiexec.c \ msiexec.c \
msiexec.man.in \
msiexec.svg \
rsrc.rc \
service.c service.c
RC_SRCS = rsrc.rc
MANPAGES = msiexec.man.in
SVG_SRCS = msiexec.svg
programs/notepad/Makefile.in
View file @ 4e9f1a41
...@@ -3,12 +3,9 @@ IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 comctl32 ...@@ -3,12 +3,9 @@ IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 comctl32
EXTRADLLFLAGS = -mwindows EXTRADLLFLAGS = -mwindows
C_SRCS = \ SOURCES = \
dialog.c \ dialog.c \
main.c main.c \
notepad.man.in \
RC_SRCS = notepad.rc notepad.rc \
notepad.svg
MANPAGES = notepad.man.in
SVG_SRCS = notepad.svg
programs/regedit/Makefile.in
View file @ 4e9f1a41
...@@ -4,7 +4,7 @@ DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 ...@@ -4,7 +4,7 @@ DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
about.c \ about.c \
childwnd.c \ childwnd.c \
edit.c \ edit.c \
...@@ -13,11 +13,8 @@ C_SRCS = \ ...@@ -13,11 +13,8 @@ C_SRCS = \
listview.c \ listview.c \
main.c \ main.c \
regedit.c \ regedit.c \
regedit.man.in \
regedit.rc \
regedit.svg \
regproc.c \ regproc.c \
treeview.c treeview.c
RC_SRCS = regedit.rc
MANPAGES = regedit.man.in
SVG_SRCS = regedit.svg
programs/regsvr32/Makefile.in
View file @ 4e9f1a41
...@@ -3,9 +3,7 @@ IMPORTS = ole32 user32 kernelbase ...@@ -3,9 +3,7 @@ IMPORTS = ole32 user32 kernelbase
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
regsvr32.c regsvr32.c \
regsvr32.man.in \
RC_SRCS = regsvr32.rc regsvr32.rc
MANPAGES = regsvr32.man.in
programs/wineboot/Makefile.in
View file @ 4e9f1a41
...@@ -4,10 +4,8 @@ DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev ...@@ -4,10 +4,8 @@ DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev
EXTRADLLFLAGS = -mconsole EXTRADLLFLAGS = -mconsole
C_SRCS = \ SOURCES = \
shutdown.c \ shutdown.c \
wineboot.c wineboot.c \
wineboot.man.in \
RC_SRCS = wineboot.rc wineboot.rc
MANPAGES = wineboot.man.in
programs/winecfg/Makefile.in
View file @ 4e9f1a41
...@@ -3,22 +3,18 @@ IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gd ...@@ -3,22 +3,18 @@ IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gd
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
about.c \ about.c \
appdefaults.c \ appdefaults.c \
audio.c \ audio.c \
drive.c \ drive.c \
driveui.c \ driveui.c \
libraries.c \ libraries.c \
logo.svg \
main.c \ main.c \
theme.c \ theme.c \
winecfg.c \ winecfg.c \
winecfg.man.in \
winecfg.rc \
winecfg.svg \
x11drvdlg.c x11drvdlg.c
RC_SRCS = winecfg.rc
MANPAGES = winecfg.man.in
SVG_SRCS = \
logo.svg \
winecfg.svg
programs/wineconsole/Makefile.in
View file @ 4e9f1a41
...@@ -4,9 +4,7 @@ DELAYIMPORTS = comctl32 user32 gdi32 ...@@ -4,9 +4,7 @@ DELAYIMPORTS = comctl32 user32 gdi32
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
wineconsole.c wineconsole.c \
wineconsole.man.in \
RC_SRCS = wineconsole.rc wineconsole.rc
MANPAGES = wineconsole.man.in
programs/winedbg/Makefile.in
View file @ 4e9f1a41
...@@ -5,13 +5,15 @@ DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 ws2_32 ...@@ -5,13 +5,15 @@ DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 ws2_32
EXTRADLLFLAGS = -mconsole EXTRADLLFLAGS = -mconsole
C_SRCS = \ SOURCES = \
be_arm.c \ be_arm.c \
be_arm64.c \ be_arm64.c \
be_i386.c \ be_i386.c \
be_x86_64.c \ be_x86_64.c \
break.c \ break.c \
crashdlg.c \ crashdlg.c \
dbg.y \
debug.l \
display.c \ display.c \
expr.c \ expr.c \
gdbproxy.c \ gdbproxy.c \
...@@ -24,11 +26,6 @@ C_SRCS = \ ...@@ -24,11 +26,6 @@ C_SRCS = \
tgt_minidump.c \ tgt_minidump.c \
tgt_module.c \ tgt_module.c \
types.c \ types.c \
winedbg.c winedbg.c \
winedbg.man.in \
RC_SRCS = winedbg.rc winedbg.rc
LEX_SRCS = debug.l
BISON_SRCS = dbg.y
MANPAGES = winedbg.man.in
programs/winefile/Makefile.in
View file @ 4e9f1a41
...@@ -3,11 +3,8 @@ IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi ...@@ -3,11 +3,8 @@ IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
winefile.c winefile.c \
winefile.man.in \
RC_SRCS = winefile.rc winefile.rc \
winefile.svg
MANPAGES = winefile.man.in
SVG_SRCS = winefile.svg
programs/winemine/Makefile.in
View file @ 4e9f1a41
...@@ -4,12 +4,9 @@ DELAYIMPORTS = shell32 ...@@ -4,12 +4,9 @@ DELAYIMPORTS = shell32
EXTRADLLFLAGS = -mwindows -municode EXTRADLLFLAGS = -mwindows -municode
C_SRCS = \ SOURCES = \
dialog.c \ dialog.c \
main.c main.c \
winemine.man.in \
RC_SRCS = winemine.rc winemine.rc \
winemine.svg
MANPAGES = winemine.man.in
SVG_SRCS = winemine.svg
programs/winepath/Makefile.in
View file @ 4e9f1a41
...@@ -2,6 +2,6 @@ MODULE = winepath.exe ...@@ -2,6 +2,6 @@ MODULE = winepath.exe
EXTRADLLFLAGS = -mconsole -municode EXTRADLLFLAGS = -mconsole -municode
C_SRCS = winepath.c SOURCES = \
winepath.c \
MANPAGES = winepath.man.in winepath.man.in
server/Makefile.in
View file @ 4e9f1a41
PROGRAMS = wineserver PROGRAMS = wineserver
C_SRCS = \ SOURCES = \
async.c \ async.c \
atom.c \ atom.c \
change.c \ change.c \
...@@ -42,12 +42,10 @@ C_SRCS = \ ...@@ -42,12 +42,10 @@ C_SRCS = \
unicode.c \ unicode.c \
user.c \ user.c \
window.c \ window.c \
winstation.c
MANPAGES = \
wineserver.de.UTF-8.man.in \ wineserver.de.UTF-8.man.in \
wineserver.fr.UTF-8.man.in \ wineserver.fr.UTF-8.man.in \
wineserver.man.in wineserver.man.in \
winstation.c
UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS) UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS)
......
tools/make_makefiles
View file @ 4e9f1a41
...@@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@) ...@@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@)
my $make = $makefiles{"$dir/Makefile.in"}; my $make = $makefiles{"$dir/Makefile.in"};
my $name = substr( $file, length($dir) + 1 ); my $name = substr( $file, length($dir) + 1 );
if ($name =~ /\.(m|mc|po|sfd)$/) if ($name =~ /\.(in|m|mc|po|sfd)$/)
{ {
push @{${$make}{"=SOURCES"}}, $name; push @{${$make}{"=SOURCES"}}, $name;
next; next;
...@@ -363,15 +363,6 @@ sub assign_sources_to_makefiles(@) ...@@ -363,15 +363,6 @@ sub assign_sources_to_makefiles(@)
die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file); die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file);
push @{${$make}{"=IDL_SRCS"}}, $name; push @{${$make}{"=IDL_SRCS"}}, $name;
} }
elsif ($name =~ /\.man\.in$/)
{
push @{${$make}{"=MANPAGES"}}, $name;
}
elsif ($name =~ /\.in$/)
{
push @{${$make}{"=SOURCES"}}, $name;
next;
}
elsif ($name =~ /\.spec$/) elsif ($name =~ /\.spec$/)
{ {
my $dllflags = ${$make}{"EXTRADLLFLAGS"} || ""; my $dllflags = ${$make}{"EXTRADLLFLAGS"} || "";
......
tools/widl/Makefile.in
View file @ 4e9f1a41
PROGRAMS = widl PROGRAMS = widl
PARENTSRC = ../wrc PARENTSRC = ../wrc
C_SRCS = \ SOURCES = \
attribute.c \ attribute.c \
client.c \ client.c \
expr.c \ expr.c \
hash.c \ hash.c \
header.c \ header.c \
parser.l \
parser.y \
ppl.l \
ppy.y \
proxy.c \ proxy.c \
register.c \ register.c \
server.c \ server.c \
...@@ -15,19 +19,10 @@ C_SRCS = \ ...@@ -15,19 +19,10 @@ C_SRCS = \
typetree.c \ typetree.c \
utils.c \ utils.c \
widl.c \ widl.c \
widl.man.in \
wpp.c \ wpp.c \
write_msft.c write_msft.c
LEX_SRCS = \
parser.l \
ppl.l
BISON_SRCS = \
parser.y \
ppy.y
MANPAGES = widl.man.in
widl_EXTRADEFS = \ widl_EXTRADEFS = \
-DINCLUDEDIR="\"${includedir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \
-DDLLDIR="\"${dlldir}\"" \ -DDLLDIR="\"${dlldir}\"" \
......
tools/winebuild/Makefile.in
View file @ 4e9f1a41
PROGRAMS = winebuild PROGRAMS = winebuild
MANPAGES = winebuild.man.in
C_SRCS = \ SOURCES = \
import.c \ import.c \
main.c \ main.c \
parser.c \ parser.c \
...@@ -10,6 +9,7 @@ C_SRCS = \ ...@@ -10,6 +9,7 @@ C_SRCS = \
res32.c \ res32.c \
spec16.c \ spec16.c \
spec32.c \ spec32.c \
utils.c utils.c \
winebuild.man.in
INSTALL_DEV = $(PROGRAMS) INSTALL_DEV = $(PROGRAMS)
tools/winedump/Makefile.in
View file @ 4e9f1a41
PROGRAMS = winedump PROGRAMS = winedump
MANPAGES = winedump.man.in
SCRIPTS = function_grep.pl SCRIPTS = function_grep.pl
C_SRCS = \ SOURCES = \
debug.c \ debug.c \
dos.c \ dos.c \
dump.c \ dump.c \
...@@ -26,6 +25,7 @@ C_SRCS = \ ...@@ -26,6 +25,7 @@ C_SRCS = \
reg.c \ reg.c \
search.c \ search.c \
symbol.c \ symbol.c \
tlb.c tlb.c \
winedump.man.in
INSTALL_DEV = $(PROGRAMS) $(SCRIPTS) INSTALL_DEV = $(PROGRAMS) $(SCRIPTS)
tools/winegcc/Makefile.in
View file @ 4e9f1a41
PROGRAMS = winegcc PROGRAMS = winegcc
MANPAGES = winegcc.man.in SOURCES = \
utils.c \
winegcc.c \
winegcc.man.in
winegcc_SYMLINKS = winecpp wineg++ winegcc_SYMLINKS = winecpp wineg++
C_SRCS = \
utils.c \
winegcc.c
winegcc_EXTRADEFS = \ winegcc_EXTRADEFS = \
-DINCLUDEDIR="\"${includedir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \
-DLIBDIR="\"${libdir}\"" \ -DLIBDIR="\"${libdir}\"" \
......
tools/winemaker/Makefile.in
View file @ 4e9f1a41
SCRIPTS = winemaker SCRIPTS = winemaker
MANPAGES = \ SOURCES = \
winemaker.de.UTF-8.man.in \ winemaker.de.UTF-8.man.in \
winemaker.fr.UTF-8.man.in \ winemaker.fr.UTF-8.man.in \
winemaker.man.in winemaker.man.in
......
tools/wmc/Makefile.in
View file @ 4e9f1a41
PROGRAMS = wmc PROGRAMS = wmc
MANPAGES = wmc.man.in
UNIX_LIBS = $(GETTEXTPO_LIBS) UNIX_LIBS = $(GETTEXTPO_LIBS)
C_SRCS = \ SOURCES = \
lang.c \ lang.c \
mcl.c \ mcl.c \
mcy.y \
po.c \ po.c \
utils.c \ utils.c \
wmc.c \ wmc.c \
wmc.man.in \
write.c write.c
BISON_SRCS = mcy.y
wmc_EXTRADEFS = \ wmc_EXTRADEFS = \
-DNLSDIR="\"${nlsdir}\"" \ -DNLSDIR="\"${nlsdir}\"" \
-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\"
......
tools/wrc/Makefile.in
View file @ 4e9f1a41
PROGRAMS = wrc PROGRAMS = wrc
UNIX_LIBS = $(GETTEXTPO_LIBS) UNIX_LIBS = $(GETTEXTPO_LIBS)
C_SRCS = \ SOURCES = \
genres.c \ genres.c \
newstruc.c \ newstruc.c \
parser.l \
parser.y \
po.c \ po.c \
ppl.l \
ppy.y \
utils.c \ utils.c \
wpp.c \ wpp.c \
wrc.c wrc.c \
wrc.man.in
LEX_SRCS = \
parser.l \
ppl.l
BISON_SRCS = \
parser.y \
ppy.y
MANPAGES = wrc.man.in
wrc_EXTRADEFS = \ wrc_EXTRADEFS = \
-DNLSDIR="\"${nlsdir}\"" \ -DNLSDIR="\"${nlsdir}\"" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment