| Revision | d40657e1b6827b6fc5d216d1a411c572c958a7ae (tree) |
|---|---|
| Time | 2013-01-25 16:56:44 |
| Author | Katsuhiko Nishimra <ktns.87@gmai...> |
| Commiter | Katsuhiko Nishimra |
Fix ignored CFLAGS. #28588
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1260 1136aad2-a195-0410-b898-f5ea1d11b9d8
src/Makefile (diff)| @@ -18,20 +18,22 @@ | ||
| 18 | 18 | #//************************************************************************// |
| 19 | 19 | |
| 20 | 20 | .PHONY: all clean |
| 21 | -CONFIGURE_OPTIONS_INT= | |
| 22 | -CFLAGS_INT= | |
| 23 | -LDFLAGS_INT= | |
| 21 | +CONFIGURE_OPTIONS = | |
| 22 | +CFLAGS = | |
| 23 | +CXXFLAGS = | |
| 24 | +LDFLAGS = | |
| 25 | +override CXXFLAGS += $(CFLAGS) | |
| 24 | 26 | ifeq ($(OPENBLASDIR),) |
| 25 | 27 | ifeq ($(BLASLIB),openblas) |
| 26 | - CONFIGURE_OPTIONS_INT+= --with-blas=openblas | |
| 28 | + override CONFIGURE_OPTIONS += --with-blas=openblas | |
| 27 | 29 | endif |
| 28 | 30 | else |
| 29 | - CONFIGURE_OPTIONS_INT+= --with-openblas=$(OPENBLASDIR) | |
| 31 | + override CONFIGURE_OPTIONS += --with-openblas=$(OPENBLASDIR) | |
| 30 | 32 | endif |
| 31 | 33 | |
| 32 | 34 | ifeq ($(BOOSTDIR),) |
| 33 | 35 | else |
| 34 | - CONFIGURE_OPTIONS_INT+= --with-boost=$(BOOSTDIR) | |
| 36 | + override CONFIGURE_OPTIONS += --with-boost=$(BOOSTDIR) | |
| 35 | 37 | endif |
| 36 | 38 | |
| 37 | 39 | all: MolDS.out |
| @@ -39,7 +41,7 @@ all: MolDS.out | ||
| 39 | 41 | build/Makefile: |
| 40 | 42 | mkdir -p build |
| 41 | 43 | cd build; \ |
| 42 | - CFLAGS="$(CFLAGS)$(CFLAGS_INT)" LDFLAGS="$(LDFLAGS)$(LDFLAGS_INT)" ../configure $(CONFIGURE_OPTIONS)$(CONFIGURE_OPTIONS_INT) | |
| 44 | + ../configure $(CONFIGURE_OPTIONS) CXXFLAGS='$(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' | |
| 43 | 45 | |
| 44 | 46 | build/MolDS: build/Makefile $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*.h) |
| 45 | 47 | +make -C build |
Fork