system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 17:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

makefiles: Automatically add dll flags where necessary.

Browse source
This commit is contained in:
Alexandre Julliard 2014-01-01 21:33:06 +01:00
parent 1cd2786f92
commit e9afeb2a50
8 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Make.rules.in
View file

@ -12,7 +12,7 @@
# First some useful definitions # First some useful definitions
DEFS = -D__WINESRC__ $(EXTRADEFS) DEFS = -D__WINESRC__ $(EXTRADEFS)
ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS)
RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS)

1
Make.vars.in
View file

@ -39,6 +39,7 @@ LN_S = @LN_S@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
TOOLSDIR = @TOOLSDIR@ TOOLSDIR = @TOOLSDIR@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
DLLFLAGS = @DLLFLAGS@
PRELINK = @PRELINK@ PRELINK = @PRELINK@
FONTFORGE = @FONTFORGE@ FONTFORGE = @FONTFORGE@
RSVG = @RSVG@ RSVG = @RSVG@

12
configure vendored
View file

@ -16530,24 +16530,18 @@ ac_config_commands="$ac_config_commands include/stamp-h"
$as_echo_n "creating Makefile rules..." >&6 $as_echo_n "creating Makefile rules..." >&6
MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS MAKE_IMPLIB_RULES=""
"
MAKE_DLL_RULES=" MAKE_DLL_RULES=""
DLLFLAGS = $DLLFLAGS
"
MAKE_PROG_RULES=" MAKE_PROG_RULES=""
DLLFLAGS = $DLLFLAGS
"
MAKE_TEST_RULES=" MAKE_TEST_RULES="
DLLFLAGS = $DLLFLAGS
RUNTESTFLAGS = -q -P wine RUNTESTFLAGS = -q -P wine
" "

12
configure.ac
View file

@ -2593,23 +2593,17 @@ AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD
dnl Import library rules dnl Import library rules
AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS AC_SUBST(MAKE_IMPLIB_RULES,"")
")
dnl Dll and program rules dnl Dll and program rules
AC_SUBST(MAKE_DLL_RULES," AC_SUBST(MAKE_DLL_RULES,"")
DLLFLAGS = $DLLFLAGS
")
AC_SUBST(MAKE_PROG_RULES," AC_SUBST(MAKE_PROG_RULES,"")
DLLFLAGS = $DLLFLAGS
")
dnl Test rules dnl Test rules
AC_SUBST(MAKE_TEST_RULES," AC_SUBST(MAKE_TEST_RULES,"
DLLFLAGS = $DLLFLAGS
RUNTESTFLAGS = -q -P wine RUNTESTFLAGS = -q -P wine
") ")

1
libs/port/Makefile.in
View file

@ -1,4 +1,3 @@
DLLFLAGS = @DLLFLAGS@
STATICLIB = libwine_port.a STATICLIB = libwine_port.a
C_SRCS = \ C_SRCS = \

1
libs/wine/Makefile.in
View file

@ -1,4 +1,3 @@
DLLFLAGS = @DLLFLAGS@
EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
EXTRADEFS = -DWINE_UNICODE_API="" \ EXTRADEFS = -DWINE_UNICODE_API="" \
-DBINDIR='"$(bindir)"' \ -DBINDIR='"$(bindir)"' \

1
libs/wpp/Makefile.in
View file

@ -1,4 +1,3 @@
DLLFLAGS = @DLLFLAGS@
STATICLIB = libwpp.a STATICLIB = libwpp.a
C_SRCS = \ C_SRCS = \

2
tools/makedep.c
View file

@ -1376,6 +1376,7 @@ static struct strarray output_sources(void)
struct strarray includes = empty_strarray; struct strarray includes = empty_strarray;
struct strarray subdirs = empty_strarray; struct strarray subdirs = empty_strarray;
struct strarray phony_targets = empty_strarray; struct strarray phony_targets = empty_strarray;
struct strarray dllflags = get_expanded_make_var_array( "DLLFLAGS" );
struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); struct strarray imports = get_expanded_make_var_array( "IMPORTS" );
struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" );
struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" );
@ -1578,6 +1579,7 @@ static struct strarray output_sources(void)
output( "%s.o: %s\n", obj, sourcedep ); output( "%s.o: %s\n", obj, sourcedep );
output( "\t$(CC) -c -o $@ %s", source->filename ); output( "\t$(CC) -c -o $@ %s", source->filename );
output_filenames( includes ); output_filenames( includes );
if (module || staticlib || testdll) output_filenames( dllflags );
output_filename( "$(ALLCFLAGS)" ); output_filename( "$(ALLCFLAGS)" );
output( "\n" ); output( "\n" );
if (crosstarget && need_cross) if (crosstarget && need_cross)