Makedll.rules: Add a generic EXTRADLLFLAGS variable instead of defining a…

dlls/Makedll.rules.in

@@ -4,7 +4,6 @@
 # MODULE       : name of the main module being built
 # EXTRALIBS    : extra libraries to link in (optional)
 # SPEC_SRCS16  : interface definition files for 16-bit dlls (optional)
-# SUBSYSTEM    : (optional) subsystem (for native dlls)
 #
 # plus all variables required by the global Make.rules.in
 #
@@ -32,7 +31,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS)
 # Rules for .so files
 
 $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in
-	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(DLLFILENAME:%=-Wb,-F,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
 # Rules for .dll files
 

dlls/kernel32/Makefile.in

@@ -7,8 +7,7 @@ MODULE    = kernel32.dll
 IMPORTLIB = libkernel32.$(IMPLIBEXT)
 IMPORTS   = ntdll
 EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
-DLLFILENAME = KERNEL32.dll
-BASEADDRESS = 0x7b800000
+EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
 
 SPEC_SRCS16 = \
 	comm.drv.spec \

dlls/ntdll/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = ntdll.dll
 IMPORTLIB = libntdll.$(IMPLIBEXT)
 EXTRALIBS = @IOKITLIB@
-BASEADDRESS = 0x7bc00000
+EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
 
 C_SRCS = \
 	actctx.c \