From 77fd68629356acc5747d06814aa4a86ab7f8b31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 2 Aug 2017 18:38:51 +0200 Subject: [PATCH] Align Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * don't hardcode g++ * remove -march=native from CXXFLAGS * make ldconfig work on installed directory only Upstream-Status: Pending Signed-off-by: Andreas Müller --- libs/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/Makefile b/libs/Makefile index d1bfc37..7189d0e 100644 --- a/libs/Makefile +++ b/libs/Makefile @@ -33,7 +33,6 @@ VERSION = $(MAJVERS).$(MINVERS) CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE CXXFLAGS += -fPIC -Wall CXXFLAGS += -ffast-math -funroll-loops -O3 -CXXFLAGS += -march=native LDLFAGS += LDLIBS += @@ -47,7 +46,7 @@ ZITA-CONVOLVER_H = zita-convolver.h $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O) - g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP) + $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP) install: $(ZITA-CONVOLVER_MIN) @@ -56,7 +55,7 @@ install: $(ZITA-CONVOLVER_MIN) install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR) ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO) - ldconfig + ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR) clean: /bin/rm -f *~ *.o *.a *.d *.so.* -- 2.9.4