[ekiga/gnome-2-26] [windows] Fix variable usage during building
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/gnome-2-26] [windows] Fix variable usage during building
- Date: Tue, 20 Apr 2010 20:14:46 +0000 (UTC)
commit 73448b56a2fd7bf277c2f09d1c9bb6f6a8c9419a
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Tue Apr 20 21:57:40 2010 +0200
[windows] Fix variable usage during building
win32/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index fa10126..bfa9c78 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -57,7 +57,7 @@ export STRIP:=$(HOST_TOOL_PREFIX)-strip
export AS:=$(HOST_TOOL_PREFIX)-as
export CFLAGS:=-I$(INCLUDEDIR) $(MACH_FLAGS) -DPTRACING
export CXXFLAGS:=-I$(INCLUDEDIR) $(MACH_FLAGS) -DPTRACING
-export LDFLAGS:=-L$(LIBDIR) $(MACH_FLAGS)
+export LDFLAGS:=-L$(LIBDIR) $(MACH_FLAGS)
export PKG_CONFIG_PATH:=$(LIBDIR)/pkgconfig
export PATH:=$(BINDIR):$(PATH)
export LDD:=$(BUILDROOT)/$(HOST_TOOL_PREFIX)-ldd.sh
@@ -430,7 +430,7 @@ update-sources::
$(SPEEX_DIR)/config.status: binaries $(SRCDIR)/$(SPEEX_ARCHIVE)
rm -f $(LIBDIR)/libspeex.a
tar xfz $(SRCDIR)/$(SPEEX_ARCHIVE) -C $(BUILDROOT)
- cd $(SPEEX_DIR); LDFLAGS="$$LDFLAGS -no-undefined" ./configure $(confflags)
+ cd $(SPEEX_DIR); LDFLAGS="$(LDFLAGS) -no-undefined" ./configure $(confflags)
$(LIBDIR)/libspeex.a: binaries $(SPEEX_DIR)/config.status
rm -f $(LIBDIR)/libspeex.a
@@ -693,7 +693,7 @@ else
endif
$(EKIGA_DIR)/src/ekiga.exe: binaries $(EKIGA_DIR)/config.status
- LDFLAGS="$$LDFLAGS -Wl,-subsystem,windows" $(MAKE) $(MAKEOPTS) -C $(EKIGA_DIR)
+ LDFLAGS="$(LDFLAGS) -Wl,-subsystem,windows" $(MAKE) $(MAKEOPTS) -C $(EKIGA_DIR)
$(MAKE) $(MAKEOPTS) -C $(EKIGA_DIR)/help
$(TARGETDIR)/zips: binaries $(EKIGA_DIR)/src/ekiga.exe
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]