/cpw/tomkiewicz/masterpassword: bc7b3415b5a1: Merge from main
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Tue May 14 17:22:42 EDT 2013
Changeset: bc7b3415b5a1b104af4251e584c0c93ac7a180ff
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-05-14 23:22 +0200
Branch: soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/bc7b3415b5a1
Description:
Merge from main
diffstat:
Makefile.mingw | 24 +++++++++++-----------
libpurple/Makefile.mingw | 15 +++++++------
libpurple/plugins/Makefile.mingw | 18 ++++++++--------
libpurple/plugins/perl/Makefile.mingw | 6 ++--
libpurple/plugins/perl/common/Makefile.mingw | 7 +++--
libpurple/protocols/Makefile.mingw | 6 ++--
libpurple/win32/global.mak | 1 +
libpurple/win32/rules.mak | 3 +-
libpurple/win32/targets.mak | 19 +++++++++++------
pidgin/Makefile.mingw | 16 ++++++++------
pidgin/pixmaps/Makefile.mingw | 4 +-
pidgin/plugins/Makefile.mingw | 30 ++++++++++++++--------------
pidgin/plugins/perl/Makefile.mingw | 6 ++--
po/Makefile.mingw | 3 +-
14 files changed, 85 insertions(+), 73 deletions(-)
diffs (truncated from 411 to 300 lines):
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -67,20 +67,20 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) gtk_runtime_zip
all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
ifndef DISABLE_NLS
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
endif
install: all $(PIDGIN_INSTALL_DIR)
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
ifndef DISABLE_NLS
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
endif
- $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
- $(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
chmod -R 777 $(PIDGIN_INSTALL_DIR)
@@ -182,10 +182,10 @@ docs: Doxyfile.mingw
@doxygen Doxyfile.mingw
clean:
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(DEBUG_SYMBOLS_DIR).zip
rm -rf doc/html Doxyfile.mingw
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -145,8 +145,8 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all install install_shallow clean
all: $(TARGET).dll
- $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE)
- $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
install_shallow: $(PURPLE_INSTALL_DIR) $(TARGET).dll
cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
@@ -157,11 +157,12 @@ ifeq ($(CYRUS_SASL), 1)
endif
install: install_shallow all
- $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(PIDGIN_TREE_TOP)/VERSION
- sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
+ @echo -e " GEN\t$@"
+ @sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
$@.in > $@
$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
@@ -175,7 +176,7 @@ install: install_shallow all
clean:
rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
- $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
--- a/libpurple/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
@@ -46,15 +46,15 @@ LIBS = \
.PHONY: all clean plugins install
all: $(PURPLE_DLL).a plugins
- $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE)
- $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE)
- $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE)
$(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE)
install: all $(PURPLE_INSTALL_PLUGINS_DIR)
- $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
$(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE) install
cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR)
@@ -78,9 +78,9 @@ plugins: \
##
clean:
rm -f *.o *.dll
- $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) clean
$(MAKE) -C $(KEYRING_PLUGIN) -f $(MINGW_MAKEFILE) clean
include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
@@ -59,11 +59,11 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all install clean
all: $(TARGET).dll
- $(MAKE) -C ./common -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C ./common -f $(MINGW_MAKEFILE)
install: all $(PURPLE_INSTALL_PLUGINS_DIR)
cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
- $(MAKE) -C ./common -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C ./common -f $(MINGW_MAKEFILE) install
$(OBJECTS): $(PURPLE_CONFIG_H)
@@ -79,6 +79,6 @@ install: all $(PURPLE_INSTALL_PLUGINS_DI
clean:
rm -rf $(OBJECTS)
rm -rf $(TARGET).dll $(TARGET).dll.a
- $(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean
include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -108,9 +108,10 @@ install: all
$(C_FILES): $(PURPLE_CONFIG_H)
$(AUTOSPLIT):
- mkdir -p ./lib/auto
- cp Purple.pm ./lib
- $(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'
+ @echo -e " GEN\t$@"
+ @mkdir -p ./lib/auto
+ @cp Purple.pm ./lib
+ @$(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'
$(TARGET).dll: $(PURPLE_DLL).a $(PURPLE_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
diff --git a/libpurple/protocols/Makefile.mingw b/libpurple/protocols/Makefile.mingw
--- a/libpurple/protocols/Makefile.mingw
+++ b/libpurple/protocols/Makefile.mingw
@@ -13,17 +13,17 @@ SUBDIRS = gg irc jabber msn mxit novell
.PHONY: all install clean
all:
- for subdir in $(SUBDIRS); do \
+ $(MAKE_at) for subdir in $(SUBDIRS); do \
$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) || exit 1; \
done;
install: all
- for subdir in $(SUBDIRS); do \
+ $(MAKE_at) for subdir in $(SUBDIRS); do \
$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1; \
done;
clean:
- for subdir in $(SUBDIRS); do \
+ $(MAKE_at) for subdir in $(SUBDIRS); do \
$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean || exit 1; \
done;
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -124,6 +124,7 @@ GPG_SIGN ?= gpg
PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
MINGW_MAKEFILE := Makefile.mingw
+MAKE_at := @
INSTALL_PIXMAPS ?= 1
INSTALL_SSL_CERTIFICATES ?= 1
diff --git a/libpurple/win32/rules.mak b/libpurple/win32/rules.mak
--- a/libpurple/win32/rules.mak
+++ b/libpurple/win32/rules.mak
@@ -7,7 +7,8 @@
$(TAG) "PERL" $(PERL) -MExtUtils::ParseXS -e 'ExtUtils::ParseXS::process_file(filename => "$<", output => "$@", typemap => "$(PURPLE_PERL_TOP)/common/typemap");'
%.o: %.rc
- $(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
+ @echo -e " GEN\t$@"
+ @$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
%.desktop: %.desktop.in $(wildcard $(PIDGIN_TREE_TOP)/po/*.po)
LC_ALL=C $(PERL) $(INTLTOOL_MERGE) -d -u -c $(PIDGIN_TREE_TOP)/po/.intltool-merge-cache $(PIDGIN_TREE_TOP)/po $< $@
diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -6,26 +6,31 @@
#
$(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).mingw $(PIDGIN_TREE_TOP)/configure.ac
- sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@
+ @echo -e " GEN\t$@"
+ @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 > $@
+ @echo -e " GEN\t$@"
+ @sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@
$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
- awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \
+ @echo -e " GEN\t$@"
+ @awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \
/^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \
/^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \
/^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
$(PIDGIN_REVISION_RAW_TXT):
- (hg --cwd $(PIDGIN_TREE_TOP) id -i --debug) 2>/dev/null >$@ \
+ @echo -e " GEN\t$@"
+ @(hg --cwd $(PIDGIN_TREE_TOP) id -i --debug) 2>/dev/null >$@ \
|| rm -f $@
$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT)
- if [ -f $< ]; then \
+ @echo -e " GEN\t$@"
+ @if [ -f $< ]; then \
sed 's/^\(.\{1,\}\)$$/#define REVISION "\1"/' $< > $@; \
fi
- [ -f $@ ] || echo "#define REVISION \"unknown\"" > $@
+ @[ -f $@ ] || echo "#define REVISION \"unknown\"" > $@
$(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll
@@ -34,7 +39,7 @@
$(MAKE) -C $(PURPLE_PERL_TOP) -f $(MINGW_MAKEFILE) perl.dll
$(PIDGIN_DLL) $(PIDGIN_DLL).a:
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
$(PIDGIN_EXE):
$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -144,10 +144,11 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all install install_shallow clean
all: $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
- $(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE)
win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
- sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
+ @echo -e " GEN\t$@"
+ @sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
-e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
$@.in > $@
@@ -157,11 +158,12 @@ install_shallow: $(PIDGIN_INSTALL_DIR) $
cp -r themes/* "$(PIDGIN_INSTALL_DIR)/pidgin/theme/"
install: install_shallow all
- $(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
- sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
+ @echo -e " GEN\t$@"
+ @sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
$@.in > $@
$(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
@@ -178,8 +180,8 @@ gtkdebug.c: gtkdebug.html.h
## CLEAN RULES
More information about the Commits
mailing list