# HG changeset patch # User Stu Tomlinson # Date 1275711372 0 # Node ID d88c15d3d8faa07fd164478920e8a6e50732a68d # Parent be6df97a8c4e54589a4fdb9c439c167ad144c9a0# Parent ed909ccaeb36c7afe6dd9b2811b671eb9a5e57e9 merge of '2354bdb318de029dd9fd2b15e2bb66ffe99920a6' and '5cd4c8d6a9a467480e21ae349de63f7f200ad39b' diff -r ed909ccaeb36 -r d88c15d3d8fa pidgin/Makefile.mingw --- a/pidgin/Makefile.mingw Sat Jun 05 01:28:37 2010 +0000 +++ b/pidgin/Makefile.mingw Sat Jun 05 04:16:12 2010 +0000 @@ -162,7 +162,7 @@ $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS) $(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll -$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS) +$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll $(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe ##