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
abfb11e1
Commit
abfb11e1
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Add shell functions to generate dependencies for symlinks and rule files.
parent
3cc14dc3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.in
+1
-6
1 addition, 6 deletions
Makefile.in
aclocal.m4
+26
-7
26 additions, 7 deletions
aclocal.m4
configure
+35
-24
35 additions, 24 deletions
configure
with
62 additions
and
37 deletions
Makefile.in
+
1
−
6
View file @
abfb11e1
...
...
@@ -39,8 +39,6 @@ WINAPI_CHECK_EXTRA_FLAGS = --global
# Rules for re-running configure
ALL_CONFIGS
=
Makefile @ALL_MAKERULES@ @ALL_SYMLINKS@
$(SRCDIR)/configure
:
@MAINTAINER_MODE@ configure.ac aclocal.m4
cd
$(
SRCDIR
)
&&
autoconf
--warnings
=
all
...
...
@@ -56,9 +54,6 @@ include/config.h: include/stamp-h
include/stamp-h
:
include/config.h.in config.status
@
./config.status include/config.h include/stamp-h
$(ALL_CONFIGS)
:
@
./config.status
$@
# Rules for cleaning
.PHONY
:
__clean__
...
...
@@ -66,7 +61,7 @@ clean:: __clean__
$(
RM
)
tools/makedep
$(
EXEEXT
)
distclean
::
clean
$(
RM
)
config.
*
configure.lineno TAGS tags include/config.h include/stamp-h
$(
ALL_CONFIGS
)
$(
RM
)
config.
*
configure.lineno TAGS tags include/config.h include/stamp-h
Makefile
$(
RM
)
-r
autom4te.cache
# Dependencies between directories
...
...
This diff is collapsed.
Click to expand it.
aclocal.m4
+
26
−
7
View file @
abfb11e1
...
...
@@ -141,11 +141,10 @@ dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS])
dnl
AC_DEFUN([WINE_CONFIG_HELPERS],
[AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies
Makefile: Makefile.in Make.rules config.status
"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries
"])
Makefile: Makefile.in Make.rules config.status
@./config.status Makefile
"])
AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
...
...
@@ -355,6 +354,27 @@ install-dev:: $ac_dir
all __tooldeps__ .PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port dummy
@cd $ac_dir && \$(MAKE)"])
}
wine_fn_config_makerules ()
{
ac_rules=$[1]
ac_deps=$[2]
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_rules: $ac_rules.in $ac_deps config.status
@./config.status $ac_rules
distclean::
\$(RM) $ac_rules"
}
wine_fn_config_symlink ()
{
ac_link=$[1]
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_link:
@./config.status $ac_link
distclean::
\$(RM) $ac_link"
}])
dnl **** Define helper function to append a file to a makefile file list ****
...
...
@@ -382,15 +402,14 @@ dnl Usage: WINE_CONFIG_SYMLINK(name,target)
dnl
AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
m4_if([$2],,[test "$srcdir" = "." || ])
WINE_APPEND_FILE(ALL_SYMLINKS,[
$1])
])
m4_if([$2],,[test "$srcdir" = "." || ])
wine_fn_config_symlink
$1])
dnl **** Create a make rules file from config.status ****
dnl
dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps)
dnl
AC_DEFUN([WINE_CONFIG_MAKERULES],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
WINE_APPEND_FILE(ALL_MAKERULES,[$1])
WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[$1: m4_ifval([$3],[$1.in $3],[$1.in]) config.status])
wine_fn_config_makerules $1 $3
$2=$1
AC_SUBST_FILE([$2])dnl
AC_CONFIG_FILES([$1])])
...
...
This diff is collapsed.
Click to expand it.
configure
+
35
−
24
View file @
abfb11e1
...
...
@@ -598,8 +598,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_TEST_BINARIES
ALL_SYMLINKS
ALL_MAKERULES
ALL_WINETEST_DEPENDS
ALL_MAKEFILE_DEPENDS
LDAPLIBS
...
...
@@ -13845,14 +13843,11 @@ ac_config_commands="$ac_config_commands include/stamp-h"
ALL_MAKEFILE_DEPENDS
=
"# Makefile dependencies
Makefile: Makefile.in Make.rules config.status"
Makefile: Makefile.in Make.rules config.status
@./config.status Makefile"
ALL_WINETEST_DEPENDS
=
"# Test binaries"
ALL_MAKERULES
=
""
ALL_
SYMLINKS
=
"
"
ALL_
WINETEST_DEPENDS
=
"# Test binaries
"
ALL_TEST_BINARIES
=
""
...
...
@@ -14084,18 +14079,39 @@ $ac_dir: $ac_dir/Makefile libs/port dummy
@cd
$ac_dir
&&
\$
(MAKE)"
fi
}
wine_fn_config_makerules
()
{
ac_rules
=
$1
ac_deps
=
$2
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"
$ac_rules
:
$ac_rules
.in
$ac_deps
config.status
@./config.status
$ac_rules
distclean::
\$
(RM)
$ac_rules
"
}
wine_fn_config_symlink
()
{
ac_link
=
$1
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"
$ac_link
:
@./config.status
$ac_link
distclean::
\$
(RM)
$ac_link
"
}
ac_config_links
=
"
$ac_config_links
dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
test
"
$srcdir
"
=
"."
||
wine_fn_
append_file ALL_SYMLINKS
"
dlls/wineps.drv/generic.ppd
"
test
"
$srcdir
"
=
"."
||
wine_fn_
config_symlink
dlls/wineps.drv/generic.ppd
ac_config_links
=
"
$ac_config_links
fonts/marlett.ttf:fonts/marlett.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_
append_file ALL_SYMLINKS
"
fonts/marlett.ttf
"
test
"
$srcdir
"
=
"."
||
wine_fn_
config_symlink
fonts/marlett.ttf
ac_config_links
=
"
$ac_config_links
fonts/symbol.ttf:fonts/symbol.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_
append_file ALL_SYMLINKS
"
fonts/symbol.ttf
"
test
"
$srcdir
"
=
"."
||
wine_fn_
config_symlink
fonts/symbol.ttf
ac_config_links
=
"
$ac_config_links
fonts/tahoma.ttf:fonts/tahoma.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_
append_file ALL_SYMLINKS
"
fonts/tahoma.ttf
"
test
"
$srcdir
"
=
"."
||
wine_fn_
config_symlink
fonts/tahoma.ttf
ac_config_links
=
"
$ac_config_links
fonts/tahomabd.ttf:fonts/tahomabd.ttf"
test
"
$srcdir
"
=
"."
||
wine_fn_
append_file ALL_SYMLINKS
"
fonts/tahomabd.ttf
"
test
"
$srcdir
"
=
"."
||
wine_fn_
config_symlink
fonts/tahomabd.ttf
ac_config_links
=
"
$ac_config_links
wine:tools/winewrapper"
wine_fn_
append_file ALL_SYMLINKS
"
wine
"
wine_fn_
config_symlink
wine
ac_config_commands
=
"
$ac_config_commands
dlls/gdi32/enhmfdrv"
...
...
@@ -14110,28 +14126,23 @@ ac_config_commands="$ac_config_commands dlls/wineps.drv/data"
ac_config_commands
=
"
$ac_config_commands
include/wine"
wine_fn_append_file ALL_MAKERULES
"Make.rules"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"Make.rules: Make.rules.in config.status"
wine_fn_config_makerules Make.rules
MAKE_RULES
=
Make.rules
ac_config_files
=
"
$ac_config_files
Make.rules"
wine_fn_append_file ALL_MAKERULES
"Maketest.rules"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"Maketest.rules: Maketest.rules.in Make.rules config.status"
wine_fn_config_makerules Maketest.rules Make.rules
MAKE_TEST_RULES
=
Maketest.rules
ac_config_files
=
"
$ac_config_files
Maketest.rules"
wine_fn_append_file ALL_MAKERULES
"dlls/Makedll.rules"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"dlls/Makedll.rules: dlls/Makedll.rules.in Make.rules config.status"
wine_fn_config_makerules dlls/Makedll.rules Make.rules
MAKE_DLL_RULES
=
dlls/Makedll.rules
ac_config_files
=
"
$ac_config_files
dlls/Makedll.rules"
wine_fn_append_file ALL_MAKERULES
"dlls/Makeimplib.rules"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"dlls/Makeimplib.rules: dlls/Makeimplib.rules.in Make.rules config.status"
wine_fn_config_makerules dlls/Makeimplib.rules Make.rules
MAKE_IMPLIB_RULES
=
dlls/Makeimplib.rules
ac_config_files
=
"
$ac_config_files
dlls/Makeimplib.rules"
wine_fn_append_file ALL_MAKERULES
"programs/Makeprog.rules"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
"programs/Makeprog.rules: programs/Makeprog.rules.in Make.rules config.status"
wine_fn_config_makerules programs/Makeprog.rules Make.rules
MAKE_PROG_RULES
=
programs/Makeprog.rules
ac_config_files
=
"
$ac_config_files
programs/Makeprog.rules"
...
...
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