makefiles: Automatically add dll flags where necessary.

Make.rules.in

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

Make.vars.in

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

configure

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

configure.ac

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

libs/port/Makefile.in

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

libs/wine/Makefile.in

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

libs/wpp/Makefile.in

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

tools/makedep.c

@@ -1376,6 +1376,7 @@ static struct strarray output_sources(void)
     struct strarray includes = empty_strarray;
     struct strarray subdirs = 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 all_targets = get_expanded_make_var_array( "PROGRAMS" );
     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( "\t$(CC) -c -o $@ %s", source->filename );
             output_filenames( includes );
+            if (module || staticlib || testdll) output_filenames( dllflags );
             output_filename( "$(ALLCFLAGS)" );
             output( "\n" );
             if (crosstarget && need_cross)