Makefile improvements
- allow to build shared and static versions separately
- fix OSX shared build
Apparently for use in LALPulsar ResamplingOpenCL it's occasionally necessary to build a shared version of this library. This modification allows to build (and install) static and shared versions separately, and also fixes building the shared version on Mac OSX.
Merge request reports
Activity
added 1 commit
- e01a2fd1 - Makefile: improve selection of possible include paths
3 3 CXX ?= g++ 4 4 AR ?= ar 5 5 6 TARGET = libclfft.a 7 TARGET2 = libclfft.so 6 TARGET = libeclfft.a 7 TARGET2 = libeclfft.so 8 8 9 CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDAPPSDKROOT)/include -I../include -fPIC 9 ifndef OPENCL_INCLUDE 10 ifdef AMDAPPSDKROOT 11 OPENCL_INCLUDE = $(AMDAPPSDKROOT)/include changed this line in version 4 of the diff
35 58 install: $(TARGET) ../include/clFFT.h may it would be nicer to have a
install-shared
install-static
andinstall
. Now amake shared install
will also install the static library even when you have a clean build dir, but amake static install
will only install the static library. I think it is because$(TARGET2)
is not on the dependencies list forinstall
changed this line in version 5 of the diff
@maxBensch This is meant to fix it. Have a try!
added 1 commit
- cec37b69 - don't force building the static version when installing
3 linux: 4 $(MAKE) -C src 5 $(MAKE) -C example 3 linux: static shared example 4 5 macos: linux 6 7 static: 8 $(MAKE) -C src static 9 10 shared: 11 $(MAKE) -C src shared 6 12 7 macos: 8 $(MAKE) -C src 13 example: changed this line in version 6 of the diff
added 1 commit
- 06adfda0 - Makefile: renamed target 'sample' to avoid conflict with directory name
@maxBensch any further comments on this? If not, I'll merge that.
added 1 commit
- 4967ca64 - example/Makefile: adapt the include path selection from src/Makefile here
@maxBensch like 4967ca64 ?
@bema yes, this is good. No further comments then.
mentioned in commit 137b4784