Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
4051eaf7
Commit
4051eaf7
authored
16 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Allow multiple variables in makefile output, and generate the programs directory lists.
parent
dbb535e4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
aclocal.m4
+2
-2
2 additions, 2 deletions
aclocal.m4
configure
+159
-46
159 additions, 46 deletions
configure
configure.ac
+48
-45
48 additions, 45 deletions
configure.ac
programs/Makefile.in
+3
-110
3 additions, 110 deletions
programs/Makefile.in
tools/make_makefiles
+12
-36
12 additions, 36 deletions
tools/make_makefiles
with
224 additions
and
239 deletions
aclocal.m4
+
2
−
2
View file @
4051eaf7
...
...
@@ -175,8 +175,8 @@ AC_DEFUN([WINE_CONFIG_MAKEFILE],
m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\
$1"])
AS_VAR_PUSHDEF([ac_enable],m4_default([$5],[enable_]ac_dir))dnl
m4_ifval([$4],[test "x$ac_enable" != xno
&& $4="$[$4]
\\
ac_dir"])
m4_ifval([$4],[test "x$ac_enable" != xno
]m4_foreach([ac_var],[$4],[ && ac_var="$ac_var
\\
ac_dir"])
)
AS_VAR_POPDEF([ac_enable])dnl
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
[$1: ]m4_ifval([$2],[$1.in $2],[$1.in])"
...
...
This diff is collapsed.
Click to expand it.
configure
+
159
−
46
View file @
4051eaf7
This diff is collapsed.
Click to expand it.
configure.ac
+
48
−
45
View file @
4051eaf7
...
...
@@ -1678,6 +1678,9 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_IMPLIB_DIRS,"")
AC_SUBST(ALL_TEST_DIRS,"")
AC_SUBST(ALL_PROGRAM_DIRS,"")
AC_SUBST(ALL_PROGRAM_INSTALL_DIRS,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
AH_TOP([#define __WINE_CONFIG_H])
...
...
@@ -2063,51 +2066,51 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/control/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/oleview/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/reg/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/regedit/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/regsvr32/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/rpcss/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/rundll32/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/secedit/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/services/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winecfg/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/wineconsole/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winedbg/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winedevice/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winefile/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winemenubuilder/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/xcopy/Makefile],[programs/Makeprog.rules])
WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/control/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/eject/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/expand/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/explorer/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/hh/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/icinfo/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/iexplore/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/oleview/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/reg/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/regedit/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/regsvr32/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/rpcss/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/rundll32/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/secedit/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/services/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winecfg/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/wineconsole/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winedbg/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winedevice/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winefile/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winemenubuilder/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([programs/xcopy/Makefile],[programs/Makeprog.rules]
,[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]
)
WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules])
...
...
This diff is collapsed.
Click to expand it.
programs/Makefile.in
+
3
−
110
View file @
4051eaf7
# Automatically generated by make_progs; DO NOT EDIT!!
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
..
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
SUBDIRS
=
\
clock
\
cmd
\
cmdlgtst
\
control
\
eject
\
expand
\
explorer
\
hh
\
icinfo
\
iexplore
\
msiexec
\
net
\
notepad
\
oleview
\
progman
\
reg
\
regedit
\
regsvr32
\
rpcss
\
rundll32
\
secedit
\
services
\
spoolsv
\
start
\
svchost
\
taskmgr
\
uninstaller
\
view
\
wineboot
\
winebrowser
\
winecfg
\
wineconsole
\
winedbg
\
winedevice
\
winefile
\
winemenubuilder
\
winemine
\
winepath
\
winetest
\
winevdm
\
winhlp32
\
winver
\
wordpad
\
write
\
xcopy
# Sub-directories to run make install into
INSTALLSUBDIRS
=
\
clock
\
cmd
\
control
\
eject
\
expand
\
explorer
\
hh
\
icinfo
\
iexplore
\
msiexec
\
net
\
notepad
\
oleview
\
progman
\
reg
\
regedit
\
regsvr32
\
rpcss
\
rundll32
\
secedit
\
services
\
spoolsv
\
start
\
svchost
\
taskmgr
\
uninstaller
\
wineboot
\
winebrowser
\
winecfg
\
wineconsole
\
winedbg
\
winedevice
\
winefile
\
winemenubuilder
\
winemine
\
winepath
\
winevdm
\
winhlp32
\
winver
\
wordpad
\
write
\
xcopy
# Programs to install in bin directory
INSTALLPROGS
=
\
msiexec
\
notepad
\
progman
\
regedit
\
regsvr32
\
uninstaller
\
wineboot
\
winebrowser
\
winecfg
\
wineconsole
\
winedbg
\
winefile
\
winemine
\
winepath
SUBDIRS
=
@ALL_PROGRAM_DIRS@
INSTALLSUBDIRS
=
@ALL_PROGRAM_INSTALL_DIRS@
INSTALLPROGS
=
@ALL_PROGRAM_BIN_INSTALL_DIRS@
INSTALLDIRS
=
$(
DESTDIR
)$(
bindir
)
...
...
This diff is collapsed.
Click to expand it.
tools/make_makefiles
+
12
−
36
View file @
4051eaf7
...
...
@@ -273,6 +273,14 @@ sub update_makefiles(@)
if
(
$rules
eq
$makerules
{"
MAKE_DLL_RULES
"})
{
$args
=
"
,[dlls],[ALL_DLL_DIRS]
";
}
elsif
(
$rules
eq
$makerules
{"
MAKE_IMPLIB_RULES
"})
{
$args
=
"
,[dlls],[ALL_IMPLIB_DIRS]
";
}
elsif
(
$rules
eq
$makerules
{"
MAKE_TEST_RULES
"})
{
$args
=
"
,[dlls],[ALL_TEST_DIRS]
";
}
elsif
(
$rules
eq
$makerules
{"
MAKE_PROG_RULES
"})
{
(
my
$name
=
$file
)
=~
s/^programs\/(.*)\/Makefile/$1/
;
$args
=
"
,[programs],[ALL_PROGRAM_DIRS
";
$args
.=
"
,ALL_PROGRAM_INSTALL_DIRS
"
unless
$dont_install
{
$name
};
$args
.=
"
,ALL_PROGRAM_BIN_INSTALL_DIRS
"
if
$bin_install
{
$name
};
$args
.=
"
]
";
}
push
@lines
,
"
WINE_CONFIG_MAKEFILE([
$file
],[
$rules
]
$args
)
\n
";
}
...
...
@@ -507,41 +515,6 @@ sub update_dlls(@)
}
################################################################
# update programs/Makefile.in
sub
update_progs
(@)
{
my
(
@subdirs
,
@install_subdirs
,
@install_progs
);
my
@ignores
=
();
foreach
my
$make
(
@
_
)
{
my
%makefile
=
%
{
$makefiles
{
$make
}};
my
$module
=
$makefile
{"
MODULE
"};
(
my
$dir
=
$make
)
=~
s/^programs\/(.*)\/Makefile$/$1/
;
die
"
Invalid module
$module
in
$make
"
unless
"
$dir
.exe
"
eq
$module
;
next
if
defined
$makefile
{"
=skip
"};
push
@subdirs
,
$dir
;
push
@ignores
,
"
programs/
$dir
/
$dir
";
push
@install_subdirs
,
$dir
unless
$dont_install
{
$dir
};
push
@install_progs
,
$dir
if
$bin_install
{
$dir
};
}
replace_in_file
(
"
programs/Makefile.in
",
'
^SUBDIRS\s*=
',
'
^INSTALLDIRS
',
"
SUBDIRS =
\\\n\t
",
join
(
"
\\\n\t
",
@subdirs
),
"
\n\n
# Sub-directories to run make install into
\n
INSTALLSUBDIRS =
\\\n\t
",
join
(
"
\\\n\t
",
@install_subdirs
),
"
\n\n
# Programs to install in bin directory
\n
INSTALLPROGS =
\\\n\t
",
join
(
"
\\\n\t
",
@install_progs
),
"
\n\n
INSTALLDIRS =
\$
(DESTDIR)
\$
(bindir)
\n
"
);
return
@ignores
;
}
################################################################
# update include/Makefile.in
...
...
@@ -592,6 +565,10 @@ sub update_gitignore(@)
{
push
@ignores
,
map
{
s/\$\(EXEEXT\)//
;
$dir
.
$_
;
}
@
{
$makefile
{"
PROGRAMS
"}};
}
if
(
$dir
=~
/^programs\/(.*)\/$/
)
{
push
@ignores
,
"
$dir
$1
";
}
}
# prepend a slash to paths that don't have one
...
...
@@ -628,5 +605,4 @@ update_makefiles( @makefiles );
push
@ignores
,
update_ignores
(
@makefiles
);
push
@ignores
,
update_winetest
(
@makefiles
);
push
@ignores
,
update_dlls
(
sort
grep
/^dlls\//
,
@makefiles
);
push
@ignores
,
update_progs
(
sort
grep
/^programs\/.*\/Makefile$/
,
@makefiles
);
update_gitignore
(
@ignores
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment