From 9835428912c20b52c716597b4b406d47ea0201cb Mon Sep 17 00:00:00 2001 From: smorlat Date: Mon, 24 Aug 2009 07:09:25 +0000 Subject: [PATCH] a few improvements and bugfixes. git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@595 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/Makefile.am | 2 +- linphone/scripts/builder-mingw.mk | 34 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/linphone/Makefile.am b/linphone/Makefile.am index ebfc748b4..a922a5460 100644 --- a/linphone/Makefile.am +++ b/linphone/Makefile.am @@ -56,7 +56,7 @@ DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/. # `make rpm' -all-local: linphone.spec linphone.iss builddate.h +all-local: linphone.spec linphone.iss linphone.spec: linphone.spec.in diff --git a/linphone/scripts/builder-mingw.mk b/linphone/scripts/builder-mingw.mk index 1108e4bc8..41c0643ee 100644 --- a/linphone/scripts/builder-mingw.mk +++ b/linphone/scripts/builder-mingw.mk @@ -2,9 +2,11 @@ prefix=/opt/linphone MSX264_SRC_DIR=$(LINPHONE_SRC_DIR)/mediastreamer2/plugins/msx264 +BUDDYLOOKUP_SRC_DIR=$(LINPHONE_SRC_DIR)/coreapi/plugins/buddylookup LOCALDIR=$(shell pwd) WORKDIR=$(LOCALDIR)/build LINPHONE_ZIP=$(WORKDIR)/linphone.zip +BUDDYLOOKUP_ZIP=$(WORKDIR)/buddylookup.zip MSX264_ZIP=$(WORKDIR)/msx264.zip INSTALL_ROOT=$(WORKDIR)/root FILELIST=$(WORKDIR)/linphone-bundle.filelist @@ -30,9 +32,9 @@ $(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 && make install + cd $(LINPHONE_SRC_DIR) && make newdate && make && make install -$(LINPHONE_ZIP): build-linphone +$(LINPHONE_ZIP): build-linphone $(WORKDIR) cd $(LINPHONE_SRC_DIR) && make zip ZIPFILE=$(LINPHONE_ZIP) install-linphone: $(LINPHONE_ZIP) $(INSTALL_ROOT) @@ -72,6 +74,34 @@ veryclean-msx264: - cd $(MSX264_SRC_DIR) && make distclean - cd $(MSX264_SRC_DIR) && rm configure +###### buddylookup rules + +$(BUDDYLOOKUP_SRC_DIR)/configure: + cd $(BUDDYLOOKUP_SRC_DIR) && ./autogen.sh + + +$(BUDDYLOOKUP_SRC_DIR)/Makefile: $(BUDDYLOOKUP_SRC_DIR)/configure + cd $(BUDDYLOOKUP_SRC_DIR) && \ + PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig ./configure --prefix=$(prefix) --enable-shared --disable-static + + +build-buddylookup: build-linphone $(BUDDYLOOKUP_SRC_DIR)/Makefile + cd $(BUDDYLOOKUP_SRC_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig make + +$(BUDDYLOOKUP_ZIP): build-buddylookup + cd $(BUDDYLOOKUP_SRC_DIR) && make zip ZIPFILE=$(BUDDYLOOKUP_ZIP) + +install-buddylookup: $(BUDDYLOOKUP_ZIP) $(INSTALL_ROOT) + cd $(INSTALL_ROOT) && unzip -o $(BUDDYLOOKUP_ZIP) + +clean-buddylookup: + - cd $(BUDDYLOOKUP_SRC_DIR) && make clean + +veryclean-buddylookup: + - cd $(BUDDYLOOKUP_SRC_DIR) && make distclean + - cd $(BUDDYLOOKUP_SRC_DIR) && rm configure + + $(FILELIST): cd $(INSTALL_ROOT) && \ rm -f $(FILELIST) && \