Mercurial > pidgin
changeset 21548:0015b58bee6f
merge of '021b5f63a39f1578bba3b42c372e25e17f1490ed'
and '613fc63763fb64693847b45da96dc5c03c6a2dd7'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 16 Nov 2007 05:14:14 +0000 |
| parents | 948ef81f4215 (diff) b03fa85e86df (current diff) |
| children | a3ed675a63b5 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.mingw Fri Nov 16 05:04:44 2007 +0000 +++ b/libpurple/Makefile.mingw Fri Nov 16 05:14:14 2007 +0000 @@ -119,7 +119,7 @@ sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \ $@.in > $@ -$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) +$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) $(TARGET).dll $(TARGET).dll.a: $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
--- a/libpurple/win32/targets.mak Fri Nov 16 05:04:44 2007 +0000 +++ b/libpurple/win32/targets.mak Fri Nov 16 05:14:14 2007 +0000 @@ -9,7 +9,7 @@ sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@ $(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in - sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/; $@.in > $@ + sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac cp $@.in $@