Mercurial > pidgin
changeset 30233:eada0ae4df00
merge of '2774f6446b6bd057a7012aad6408b8dea457fbf6'
and '369315b95ea96caa0f91acbabf434a6a0177f450'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 03 Jul 2010 01:01:39 +0000 |
| parents | 2ab000954aff (current diff) d371035542b2 (diff) |
| children | 832c94bdc3bb |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/Makefile.mingw Sat Jul 03 00:59:58 2010 +0000 +++ b/libpurple/plugins/Makefile.mingw Sat Jul 03 01:01:39 2010 +0000 @@ -55,7 +55,7 @@ $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR) -.c.dll: +%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< $(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
--- a/pidgin/plugins/Makefile.mingw Sat Jul 03 00:59:58 2010 +0000 +++ b/pidgin/plugins/Makefile.mingw Sat Jul 03 01:01:39 2010 +0000 @@ -73,7 +73,7 @@ $(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR) -.c.dll: +%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< $(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@