Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
frmdstryr
wine
Commits
7d831155
Commit
7d831155
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Define the variables that are used by aclocal macros in aclocal too.
parent
d81a8f8d
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
aclocal.m4
+21
-3
21 additions, 3 deletions
aclocal.m4
configure
+9
-9
9 additions, 9 deletions
configure
configure.ac
+0
-18
0 additions, 18 deletions
configure.ac
with
30 additions
and
30 deletions
aclocal.m4
+
21
−
3
View file @
7d831155
...
...
@@ -140,7 +140,25 @@ dnl
dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS])
dnl
AC_DEFUN([WINE_CONFIG_HELPERS],
[wine_fn_append_file ()
[AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_STATICLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_INSTALL_DIRS,"")
AC_SUBST(ALL_TEST_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_DIRS,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
wine_fn_append_file ()
{
AS_VAR_APPEND($[1]," \\$as_nl $[2]")
}
...
...
@@ -318,8 +336,8 @@ dnl **** Create a make rules file from config.status ****
dnl
dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps)
dnl
AC_DEFUN([WINE_CONFIG_MAKERULES],
[
WINE_APPEND_FILE(ALL_MAKERULES,[$1])
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])
$2=$1
AC_SUBST_FILE([$2])dnl
...
...
This diff is collapsed.
Click to expand it.
configure
+
9
−
9
View file @
7d831155
...
...
@@ -608,10 +608,10 @@ ALL_TOOL_DIRS
ALL_DLL_DIRS
ALL_TOP_DIRS
ALL_DIRS
ALL_WINETEST_DEPENDS
ALL_MAKEFILE_DEPENDS
ALL_SYMLINKS
ALL_MAKERULES
ALL_WINETEST_DEPENDS
ALL_MAKEFILE_DEPENDS
LDAPLIBS
LIBPOLL
LIBDL
...
...
@@ -13778,15 +13778,20 @@ fi ;;
esac
ALL_MAKERULES
=
""
ALL_SYMLINKS
=
""
ac_config_commands
=
"
$ac_config_commands
include/stamp-h"
ALL_MAKEFILE_DEPENDS
=
"# Makefile dependencies"
ALL_WINETEST_DEPENDS
=
"# Test binaries"
ALL_MAKERULES
=
""
ALL_SYMLINKS
=
""
ALL_DIRS
=
""
ALL_TOP_DIRS
=
""
...
...
@@ -13812,11 +13817,6 @@ ALL_PROGRAM_DIRS=""
ALL_PROGRAM_BIN_INSTALL_DIRS
=
""
ac_config_commands
=
"
$ac_config_commands
include/stamp-h"
wine_fn_append_file
()
{
as_fn_append
$1
"
\\
$as_nl
$2
"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
0
−
18
View file @
7d831155
...
...
@@ -2118,24 +2118,6 @@ esac
dnl **** Generate output files ****
AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_STATICLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_INSTALL_DIRS,"")
AC_SUBST(ALL_TEST_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_DIRS,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
AH_TOP([#define __WINE_CONFIG_H])
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
...
...
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