Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0c694d71
Commit
0c694d71
authored
Mar 04, 2008
by
Rob Shearman
Committed by
Alexandre Julliard
Mar 04, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Split AR into AR and ARFLAGS.
parent
48000893
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
7 deletions
+13
-7
Make.rules.in
Make.rules.in
+2
-1
configure
configure
+6
-2
configure.ac
configure.ac
+1
-0
Makedll.rules.in
dlls/Makedll.rules.in
+1
-1
Makeimplib.rules.in
dlls/Makeimplib.rules.in
+1
-1
Makefile.in
libs/port/Makefile.in
+1
-1
Makefile.in
libs/wpp/Makefile.in
+1
-1
No files found.
Make.rules.in
View file @
0c694d71
...
...
@@ -36,7 +36,8 @@ IMPLIBEXT = @IMPLIBEXT@
LDSHARED = @LDSHARED@
DLLTOOL = @DLLTOOL@
DLLWRAP = @DLLWRAP@
AR = @AR@ rc
AR = @AR@
ARFLAGS = @ARFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
WINDRES = @WINDRES@
...
...
configure
View file @
0c694d71
...
...
@@ -687,6 +687,7 @@ AS
ac_ct_AS
LD
AR
ARFLAGS
RANLIB
STRIP
WINDRES
...
...
@@ -5600,6 +5601,8 @@ else
AR
=
"
$ac_cv_prog_AR
"
fi
ARFLAGS
=
rc
if
test
-n
"
$ac_tool_prefix
"
;
then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set
dummy
${
ac_tool_prefix
}
ranlib
;
ac_word
=
$2
...
...
@@ -23079,6 +23082,7 @@ AS!$AS$ac_delim
ac_ct_AS!
$ac_ct_AS$ac_delim
LD!
$LD$ac_delim
AR!
$AR$ac_delim
ARFLAGS!
$ARFLAGS$ac_delim
RANLIB!
$RANLIB$ac_delim
STRIP!
$STRIP$ac_delim
WINDRES!
$WINDRES$ac_delim
...
...
@@ -23088,7 +23092,6 @@ GREP!$GREP$ac_delim
EGREP!
$EGREP$ac_delim
LDCONFIG!
$LDCONFIG$ac_delim
INSTALL_PROGRAM!
$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!
$INSTALL_SCRIPT$ac_delim
_ACEOF
if
test
`
sed
-n
"s/.*
$ac_delim
\$
/X/p"
conf
$$
subs.sed |
grep
-c
X
`
=
82
;
then
...
...
@@ -23150,6 +23153,7 @@ _ACEOF
ac_delim
=
'%!_!# '
for
ac_last_try
in
false false false false false
:
;
do
cat
>
conf
$$
subs.sed
<<
_ACEOF
INSTALL_SCRIPT!
$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!
$INSTALL_DATA$ac_delim
LINT!
$LINT$ac_delim
LINTFLAGS!
$LINTFLAGS$ac_delim
...
...
@@ -23224,7 +23228,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!
$LTLIBOBJS$ac_delim
_ACEOF
if
test
`
sed
-n
"s/.*
$ac_delim
\$
/X/p"
conf
$$
subs.sed |
grep
-c
X
`
=
7
2
;
then
if
test
`
sed
-n
"s/.*
$ac_delim
\$
/X/p"
conf
$$
subs.sed |
grep
-c
X
`
=
7
3
;
then
break
elif
$ac_last_try
;
then
{
{
echo
"
$as_me
:
$LINENO
: error: could not make
$CONFIG_STATUS
"
>
&5
...
...
configure.ac
View file @
0c694d71
...
...
@@ -158,6 +158,7 @@ fi
AC_CHECK_TOOLS(AS,[gas as],as)
AC_CHECK_TOOL(LD,ld,ld)
AC_CHECK_TOOL(AR,ar,ar)
AC_SUBST(ARFLAGS,rc)
AC_PROG_RANLIB
AC_CHECK_TOOL(STRIP,strip,strip)
AC_CHECK_TOOL(WINDRES,windres,false)
...
...
dlls/Makedll.rules.in
View file @
0c694d71
...
...
@@ -52,7 +52,7 @@ lib$(BASEMODULE).def: $(MAINSPEC)
lib$(BASEMODULE).def.a: $(IMPLIB_OBJS)
$(RM) $@
$(AR) $@ $(IMPLIB_OBJS)
$(AR) $
(ARFLAGS) $
@ $(IMPLIB_OBJS)
$(RANLIB) $@
lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS)
...
...
dlls/Makeimplib.rules.in
View file @
0c694d71
...
...
@@ -18,7 +18,7 @@ all: $(MODULE)
$(MODULE): $(OBJS) Makefile.in
$(RM) $@
$(AR) $@ $(OBJS)
$(AR) $
(ARFLAGS) $
@ $(OBJS)
$(RANLIB) $@
# Rules for installation
...
...
libs/port/Makefile.in
View file @
0c694d71
...
...
@@ -36,7 +36,7 @@ all: $(MODULE)
$(MODULE)
:
$(OBJS) Makefile.in
$(RM)
$@
$(AR)
$@
$(OBJS)
$(AR)
$
(ARFLAGS)
$
@
$(OBJS)
$(RANLIB)
$@
@DEPENDENCIES@
# everything below this line is overwritten by make depend
libs/wpp/Makefile.in
View file @
0c694d71
...
...
@@ -17,7 +17,7 @@ all: $(MODULE)
$(MODULE)
:
$(OBJS)
$(RM)
$@
$(AR)
$@
$(OBJS)
$(AR)
$
(ARFLAGS)
$
@
$(OBJS)
$(RANLIB)
$@
ppy.tab.c
:
ppy.tab.h
#
for parallel makes
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment