[vlfeat] 01/06: environmental CFLAGS, LDFLAGS, CPPFLAGS are now used
Dima Kogan
dkogan-guest at alioth.debian.org
Fri Nov 8 02:51:48 UTC 2013
This is an automated email from the git hooks/post-receive script.
dkogan-guest pushed a commit to branch patch-queue/master
in repository vlfeat.
commit eacefa5e2e17c3b86be7771adb315d03dc83a5a2
Author: Dima Kogan <dima at secretsauce.net>
Date: Wed Nov 6 22:30:54 2013 -0800
environmental CFLAGS, LDFLAGS, CPPFLAGS are now used
This patch fixes a typo and pulls in the variables
---
Makefile | 2 +-
make/dll.mak | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5584e2a..2d4aaac 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ endif
VLDIR ?= .
LIBTOOL ?= libtool
-STD_CLFAGS = $(CFLAGS)
+STD_CFLAGS = $(CFLAGS) $(CPPFLAGS)
STD_CFLAGS += -std=c99
STD_CFLAGS += -Wall -Wextra
diff --git a/make/dll.mak b/make/dll.mak
index b386c62..314fc59 100644
--- a/make/dll.mak
+++ b/make/dll.mak
@@ -26,6 +26,7 @@ DLL_CFLAGS += $(call if-like,%_sse2,$*, $(if $(DISABLE_SSE2),,-msse2))
DLL_CFLAGS += $(call if-like,%_avx,$*, $(if $(DISABLE_AVX),,-mavx))
DLL_CFLAGS += $(if $(DISABLE_OPENMP),,-fopenmp)
+DLL_LDFLAGS = $(STD_LDFLAGS)
DLL_LDFLAGS += -lm -lpthread
BINDIR = bin/$(ARCH)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git
More information about the debian-science-commits
mailing list