Commit a7bd5410 authored by Oliver Bock's avatar Oliver Bock
Browse files

Merge branch 'rename_to_eclfft' into 'master'

renamed library and header to 'eclfft' to avoid conflicts with clFFT

See merge request einsteinathome/libclfft!1
parents eafab99f 3bb1a461
...@@ -19,3 +19,6 @@ win64: ...@@ -19,3 +19,6 @@ win64:
clean: clean:
$(MAKE) -C src clean $(MAKE) -C src clean
$(MAKE) -C example clean $(MAKE) -C example clean
install:
$(MAKE) -C src install
...@@ -19,8 +19,11 @@ The codebase contains a top-level Makefile that builds the library and the examp ...@@ -19,8 +19,11 @@ The codebase contains a top-level Makefile that builds the library and the examp
* macos * macos
* win32 * win32
* win64 * win64
* install
* clean * clean
The `install` target uses the `PREFIX` variable, i.e. you should use `PREFIX=/some/path make install` or `make install PREFIX=/some/path`
# Usage # Usage
* Library * Library
......
...@@ -13,6 +13,7 @@ endif ...@@ -13,6 +13,7 @@ endif
OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o
PREFIX ?= "."
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
$(AR) rcs $(TARGET) $(OBJECTS) $(AR) rcs $(TARGET) $(OBJECTS)
...@@ -21,13 +22,18 @@ $(TARGET): $(OBJECTS) ...@@ -21,13 +22,18 @@ $(TARGET): $(OBJECTS)
fft_setup.o: fft_setup.cpp fft_internal.h fft_base_kernels.h fft_setup.o: fft_setup.cpp fft_internal.h fft_base_kernels.h
$(CXX) $(CXXFLAGS) -c fft_setup.cpp $(CXX) $(CXXFLAGS) -c fft_setup.cpp
fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h
$(CXX) $(CXXFLAGS) -c fft_execute.cpp $(CXX) $(CXXFLAGS) -c fft_execute.cpp
fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h
$(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp $(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp
install: $(TARGET) ../include/clFFT.h
mkdir -p $(PREFIX)/lib $(PREFIX)/include
cp ../include/clFFT.h $(PREFIX)/include/eclfft.h
cp $(TARGET) $(PREFIX)/lib/libeclfft.a
clean: clean:
rm -f *.o rm -f *.o
rm -f *.a rm -f *.a
...@@ -9,6 +9,7 @@ CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDA ...@@ -9,6 +9,7 @@ CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDA
OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o
PREFIX ?= "."
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
$(AR) rcs $(TARGET) $(OBJECTS) $(AR) rcs $(TARGET) $(OBJECTS)
...@@ -24,6 +25,11 @@ fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h ...@@ -24,6 +25,11 @@ fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h
fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h
$(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp $(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp
install: $(TARGET) ../include/clFFT.h
mkdir -p $(PREFIX)/lib $(PREFIX)/include
cp ../include/clFFT.h $(PREFIX)/include/eclfft.h
cp $(TARGET) $(PREFIX)/lib/libeclfft.a
clean: clean:
rm -f *.o rm -f *.o
rm -f *.a rm -f *.a
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment