zita-resampler: Remove host paths from linker flags
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 87f2f214f0bbe5b84f2687bb9b47e26e3150d5e2 Mon Sep 17 00:00:00 2001
|
||||
From 23dd312b270330a0df18b229b9f68bc74c72934b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 2 Aug 2017 17:34:18 +0200
|
||||
Subject: [PATCH] Align Makefiles
|
||||
@@ -9,28 +9,32 @@ Content-Transfer-Encoding: 8bit
|
||||
* don't hardcode g++
|
||||
* remove -march=native from CXXFLAGS
|
||||
* make ldconfig work on installed directory only
|
||||
* do not add host path to link flags
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
apps/Makefile | 5 ++---
|
||||
apps/Makefile | 6 ++----
|
||||
libs/Makefile | 5 ++---
|
||||
2 files changed, 4 insertions(+), 6 deletions(-)
|
||||
2 files changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/apps/Makefile b/apps/Makefile
|
||||
index f009937..abbdeb5 100644
|
||||
index f009937..9329b25 100644
|
||||
--- a/apps/Makefile
|
||||
+++ b/apps/Makefile
|
||||
@@ -27,7 +27,6 @@ MANDIR = /usr/share/man/man1
|
||||
LDFLAGS += -L$(PREFIX)/$(LIBDIR)
|
||||
@@ -24,10 +24,8 @@ LIBDIR = lib$(SUFFIX)
|
||||
DISTDIR = zresample-$(VERSION)
|
||||
VERSION = 1.6.0
|
||||
MANDIR = /usr/share/man/man1
|
||||
-LDFLAGS += -L$(PREFIX)/$(LIBDIR)
|
||||
CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
|
||||
CXXFLAGS += -O3 -ffast-math -Wall
|
||||
-CXXFLAGS += -march=native
|
||||
|
||||
|
||||
all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
@@ -36,7 +35,7 @@ all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
@@ -36,7 +34,7 @@ all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
ZRESAMPLE_O = zresample.o audiofile.o dither.o
|
||||
zresample: LDLIBS += -lzita-resampler -lsndfile -lrt
|
||||
zresample: $(ZRESAMPLE_O)
|
||||
@@ -39,7 +43,7 @@ index f009937..abbdeb5 100644
|
||||
$(ZRESAMPLE_O):
|
||||
-include $(ZRESAMPLE_O:%.o=%.d)
|
||||
|
||||
@@ -44,7 +43,7 @@ $(ZRESAMPLE_O):
|
||||
@@ -44,7 +42,7 @@ $(ZRESAMPLE_O):
|
||||
ZRETUNE_O = zretune.o audiofile.o dither.o
|
||||
zretune: LDLIBS += -lzita-resampler -lsndfile -lrt
|
||||
zretune: $(ZRETUNE_O)
|
||||
@@ -79,5 +83,5 @@ index 15b0471..575e670 100644
|
||||
uninstall:
|
||||
/bin/rm -rf $(DESTDIR)$(PREFIX)/include/zita-resampler
|
||||
--
|
||||
2.9.4
|
||||
2.14.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user