Skip to content

F
faiss
Unverified Commit 1e3e7f42 authored by Lucas Hosseini's avatar Lucas Hosseini Committed by GitHub
Browse files
Options

Make Makefile bourne shell compliant. (#782)

parent f443db75
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
Makefile
View file @ 1e3e7f42
...@@ -19,11 +19,9 @@ GPU_SRC = $(GPU_CPPSRC) $(GPU_CUSRC) ...@@ -19,11 +19,9 @@ GPU_SRC = $(GPU_CPPSRC) $(GPU_CUSRC)
GPU_CPPOBJ = $(GPU_CPPSRC:.cpp=.o) GPU_CPPOBJ = $(GPU_CPPSRC:.cpp=.o)
GPU_CUOBJ = $(GPU_CUSRC:.cu=.o) GPU_CUOBJ = $(GPU_CUSRC:.cu=.o)
GPU_OBJ = $(GPU_CPPOBJ) $(GPU_CUOBJ) GPU_OBJ = $(GPU_CPPOBJ) $(GPU_CUOBJ)
GPU_INSTALLDIRS = $(DESTDIR)$(includedir)/faiss/gpu/{impl,utils}
ifneq ($(strip $(NVCC)),) ifneq ($(strip $(NVCC)),)
OBJ += $(GPU_OBJ) OBJ += $(GPU_OBJ)
INSTALLDIRS += $(GPU_INSTALLDIRS)
HEADERS += $(GPU_HEADERS) HEADERS += $(GPU_HEADERS)
endif endif
...@@ -54,14 +52,15 @@ clean: ...@@ -54,14 +52,15 @@ clean:
# Installing # Installing
install: libfaiss.a libfaiss.$(SHAREDEXT) installdirs install: libfaiss.a libfaiss.$(SHAREDEXT) installdirs
cp libfaiss.{a,$(SHAREDEXT)} $(DESTDIR)$(libdir) cp libfaiss.a libfaiss.$(SHAREDEXT) $(DESTDIR)$(libdir)
tar cf - $(HEADERS) | tar xf - -C $(DESTDIR)$(includedir)/faiss/ tar cf - $(HEADERS) | tar xf - -C $(DESTDIR)$(includedir)/faiss/
installdirs: installdirs:
$(MKDIR_P) $(INSTALLDIRS) $(MKDIR_P) $(INSTALLDIRS)
uninstall: uninstall:
rm -f $(DESTDIR)$(libdir)/libfaiss.{a,$(SHAREDEXT)} rm -f $(DESTDIR)$(libdir)/libfaiss.a \
$(DESTDIR)$(libdir)/libfaiss.$(SHAREDEXT)
rm -rf $(DESTDIR)$(includedir)/faiss rm -rf $(DESTDIR)$(includedir)/faiss
......
Markdown is supported
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