1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- Makefile.orig Fri May 5 05:25:01 2006
+++ Makefile Mon May 22 03:19:18 2006
@@ -44,7 +44,7 @@
DEBUG_CFLAGS:=$(if $(subst 0,,$(DEBUG)),-DDEBUG,-DNDEBUG)
IMAGEMAGICK_CFLAGS:=$(if $(use_imagemagick),-DUSE_MAGICK $(shell Magick-config --cflags --cppflags),)
IMAGEMAGICK_LDFLAGS:=$(if $(use_imagemagick),$(shell Magick-config --ldflags --libs),)
-FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW,)
+FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW $(shell pkg-config --cflags fftw3),)
POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,)
IOCTL_CFLAGS:=$(if $(subst 0,,$(IOCTL)),-DUSE_IOCTL,)
PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\
@@ -52,13 +52,13 @@
$(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
$(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
$(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)
-FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,)
+FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),$(shell pkg-config --libs fftw3),)
OPTIMIZATION_CFLAGS:=-DOPTIMIZATIONS=$(OPTIMIZATIONS)
STL_CFLAGS:=$(if $(subst GNU,,$(HASH_MAP)),,-DHASH_MAP_GNU)\
$(if $(subst STD,,$(HASH_MAP)),,-DHASH_MAP_STD)
CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) $(STL_CFLAGS)\
- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \
- $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)
+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \
+ $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS) $(CXXFLAGS)
LDFLAGS:=$(if $(use_imagemagick),$(IMAGEMAGICK_LDFLAGS)) $(FFTW_LDFLAGS) -lm
|
