From ea700f8f9ad9977afe71893c59dd6b316db61adf Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Tue, 22 Sep 2009 14:09:42 +0000
Subject: [PATCH] add trace improve scripts
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@675 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
linphone/gtk-glade/Makefile.am | 12 +++++++++---
linphone/gtk-glade/incall_view.c | 19 ++++++++++++++++++-
linphone/gtk-glade/update.c | 1 -
linphone/scripts/builder-mingw.mk | 4 ++--
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/linphone/gtk-glade/Makefile.am b/linphone/gtk-glade/Makefile.am
index 2f23e201bc..1370554ea6 100644
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
@@ -15,9 +15,15 @@ PIXMAPS= linphone2.png \
linphone.png \
stock_people.png
+LINPHONE_ICO_RC_FILE=linphone.rc
+LINPHONE_ICO_FILE=linphone.ico
+
EXTRA_DIST= $(PIXMAPS) \
$(GLADE_FILES) \
- linphone.iss
+ linphone.iss \
+ $(LINPHONE_ICO_RC_FILE) \
+ $(LINPHONE_ICO_FILE)
+
if BUILD_GLADE_UI
@@ -50,8 +56,8 @@ linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
if BUILD_WIN32
-linphone.res: linphone.rc linphone.ico
- windres linphone.rc -O coff -o linphone.res
+linphone.res: $(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
+ windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
linphone_3_LDADD+=linphone.res -lwininet
linphone_3_LDFLAGS=-Wl,--export-all-symbols -mwindows
diff --git a/linphone/gtk-glade/incall_view.c b/linphone/gtk-glade/incall_view.c
index 793cca06c5..4e857e5741 100644
--- a/linphone/gtk-glade/incall_view.c
+++ b/linphone/gtk-glade/incall_view.c
@@ -1,4 +1,22 @@
/*
+linphone, gtk-glade interface.
+Copyright (C) 2009 Simon MORLAT (simon.morlat@linphone.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+/*
* C Implementation: incall_frame
*
* Description:
@@ -6,7 +24,6 @@
*
* Author: Simon Morlat <simon.morlat@linphone.org>, (C) 2009
*
-* Copyright: See COPYING file that comes with this distribution
*
*/
diff --git a/linphone/gtk-glade/update.c b/linphone/gtk-glade/update.c
index e904f5c54e..85ef8d7088 100755
--- a/linphone/gtk-glade/update.c
+++ b/linphone/gtk-glade/update.c
@@ -108,7 +108,6 @@ static int version_compare(const char *v1, const char *v2){
v1+=copytilldot(n1,v1);
v2+=copytilldot(n2,v2);
ms_message("Comparing %s <> %s",n1,n2);
- fflush(stdout);
ret=strcmp(n1,n2);
if (ret==0) return version_compare(v1,v2);
else return ret;
diff --git a/linphone/scripts/builder-mingw.mk b/linphone/scripts/builder-mingw.mk
index 41c0643eec..f3be1825ff 100644
--- a/linphone/scripts/builder-mingw.mk
+++ b/linphone/scripts/builder-mingw.mk
@@ -32,10 +32,10 @@ $(LINPHONE_SRC_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure
./configure --prefix=$(prefix) --enable-shared --disable-static $(LINPHONE_CONFIGURE_EXTRA_OPTIONS)
build-linphone: $(LINPHONE_SRC_DIR)/Makefile
- cd $(LINPHONE_SRC_DIR) && make newdate && make && make install
+ cd $(LINPHONE_SRC_DIR) && make newdate && make $(LINPHONE_MAKE_OPTS) && make install $(LINPHONE_MAKE_OPTS)
$(LINPHONE_ZIP): build-linphone $(WORKDIR)
- cd $(LINPHONE_SRC_DIR) && make zip ZIPFILE=$(LINPHONE_ZIP)
+ cd $(LINPHONE_SRC_DIR) && make zip ZIPFILE=$(LINPHONE_ZIP) $(LINPHONE_MAKE_OPTS)
install-linphone: $(LINPHONE_ZIP) $(INSTALL_ROOT)
cd $(INSTALL_ROOT) && unzip -o $(LINPHONE_ZIP)
--
GitLab