From b576c052dcceb73bb9eaf9c242ff6c637b84033b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 10 Oct 2003 04:31:54 +0000 Subject: [PATCH] The intermediate .tmp.o file is no longer needed. DLLMAIN is not used anymore. --- dlls/Makedll.rules.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 36644c7d6df..14aac959c4c 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -25,20 +25,16 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files -$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(IMPORTLIBS) $(WINEBUILD) - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(DLLMAIN:%=--entry %) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%) +$(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) $(IMPORTLIBS) $(WINEBUILD) + $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:.rc=.res) $(ALL_OBJS) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%) $(MODULE).so: $(MAINSPEC).o $(ALL_OBJS) Makefile.in $(LDSHARED) $(LDDLLFLAGS) $(MAINSPEC).o $(ALL_OBJS) -o $@ $(ALL_LIBS) -lc -$(MODULE).tmp.o: $(ALL_OBJS) Makefile.in - $(LDCOMBINE) $(ALL_OBJS) -o $@ - -$(STRIP) --strip-unneeded $@ - # Rules for .dll files $(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) $(IMPORTLIBS) Makefile.in - $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(DLLMAIN:%=--entry _%) -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) + $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) $(SPEC_DEF): $(WINEBUILD)